mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2025-01-10 15:58:47 +00:00
drm: remove I2C_CLASS_DDC support
After removal of the legacy EEPROM driver and I2C_CLASS_DDC support in olpc_dcon there's no i2c client driver left supporting I2C_CLASS_DDC. Class-based device auto-detection is a legacy mechanism and shouldn't be used in new code. So we can remove this class completely now. Acked-by: Alex Deucher <alexander.deucher@amd.com> Acked-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Acked-by: Harry Wentland <harry.wentland@amd.com> Acked-by: Heiko Stuebner <heiko@sntech.de> Acked-by: Jani Nikula <jani.nikula@intel.com> Acked-by: Jernej Skrabec <jernej.skrabec@gmail.com> Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de> Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Signed-off-by: Wolfram Sang <wsa@kernel.org>
This commit is contained in:
parent
2cc14f52ae
commit
e965a70727
@ -175,7 +175,6 @@ struct amdgpu_i2c_chan *amdgpu_i2c_create(struct drm_device *dev,
|
||||
|
||||
i2c->rec = *rec;
|
||||
i2c->adapter.owner = THIS_MODULE;
|
||||
i2c->adapter.class = I2C_CLASS_DDC;
|
||||
i2c->adapter.dev.parent = dev->dev;
|
||||
i2c->dev = dev;
|
||||
i2c_set_adapdata(&i2c->adapter, i2c);
|
||||
|
@ -7533,7 +7533,6 @@ create_i2c(struct ddc_service *ddc_service,
|
||||
if (!i2c)
|
||||
return NULL;
|
||||
i2c->base.owner = THIS_MODULE;
|
||||
i2c->base.class = I2C_CLASS_DDC;
|
||||
i2c->base.dev.parent = &adev->pdev->dev;
|
||||
i2c->base.algo = &amdgpu_dm_i2c_algo;
|
||||
snprintf(i2c->base.name, sizeof(i2c->base.name), "AMDGPU DM i2c hw bus %d", link_index);
|
||||
|
@ -120,7 +120,6 @@ struct ast_i2c_chan *ast_i2c_create(struct drm_device *dev)
|
||||
return NULL;
|
||||
|
||||
i2c->adapter.owner = THIS_MODULE;
|
||||
i2c->adapter.class = I2C_CLASS_DDC;
|
||||
i2c->adapter.dev.parent = dev->dev;
|
||||
i2c->dev = dev;
|
||||
i2c_set_adapdata(&i2c->adapter, i2c);
|
||||
|
@ -515,7 +515,6 @@ static struct i2c_adapter *dw_hdmi_i2c_adapter(struct dw_hdmi *hdmi)
|
||||
init_completion(&i2c->cmp);
|
||||
|
||||
adap = &i2c->adap;
|
||||
adap->class = I2C_CLASS_DDC;
|
||||
adap->owner = THIS_MODULE;
|
||||
adap->dev.parent = hdmi->dev;
|
||||
adap->algo = &dw_hdmi_algorithm;
|
||||
|
@ -2102,7 +2102,6 @@ int drm_dp_aux_register(struct drm_dp_aux *aux)
|
||||
if (!aux->ddc.algo)
|
||||
drm_dp_aux_init(aux);
|
||||
|
||||
aux->ddc.class = I2C_CLASS_DDC;
|
||||
aux->ddc.owner = THIS_MODULE;
|
||||
aux->ddc.dev.parent = aux->dev;
|
||||
|
||||
|
@ -5803,7 +5803,6 @@ static int drm_dp_mst_register_i2c_bus(struct drm_dp_mst_port *port)
|
||||
aux->ddc.algo_data = aux;
|
||||
aux->ddc.retries = 3;
|
||||
|
||||
aux->ddc.class = I2C_CLASS_DDC;
|
||||
aux->ddc.owner = THIS_MODULE;
|
||||
/* FIXME: set the kdev of the port's connector as parent */
|
||||
aux->ddc.dev.parent = parent_dev;
|
||||
|
@ -855,7 +855,6 @@ cdv_intel_dp_i2c_init(struct gma_connector *connector,
|
||||
|
||||
memset(&intel_dp->adapter, '\0', sizeof (intel_dp->adapter));
|
||||
intel_dp->adapter.owner = THIS_MODULE;
|
||||
intel_dp->adapter.class = I2C_CLASS_DDC;
|
||||
strncpy (intel_dp->adapter.name, name, sizeof(intel_dp->adapter.name) - 1);
|
||||
intel_dp->adapter.name[sizeof(intel_dp->adapter.name) - 1] = '\0';
|
||||
intel_dp->adapter.algo_data = &intel_dp->algo;
|
||||
|
@ -411,7 +411,6 @@ int gma_intel_setup_gmbus(struct drm_device *dev)
|
||||
struct intel_gmbus *bus = &dev_priv->gmbus[i];
|
||||
|
||||
bus->adapter.owner = THIS_MODULE;
|
||||
bus->adapter.class = I2C_CLASS_DDC;
|
||||
snprintf(bus->adapter.name,
|
||||
sizeof(bus->adapter.name),
|
||||
"gma500 gmbus %s",
|
||||
|
@ -168,7 +168,6 @@ static struct i2c_adapter oaktrail_hdmi_i2c_adapter = {
|
||||
.name = "oaktrail_hdmi_i2c",
|
||||
.nr = 3,
|
||||
.owner = THIS_MODULE,
|
||||
.class = I2C_CLASS_DDC,
|
||||
.algo = &oaktrail_hdmi_i2c_algorithm,
|
||||
};
|
||||
|
||||
|
@ -2426,7 +2426,6 @@ psb_intel_sdvo_init_ddc_proxy(struct psb_intel_sdvo *sdvo,
|
||||
struct drm_device *dev)
|
||||
{
|
||||
sdvo->ddc.owner = THIS_MODULE;
|
||||
sdvo->ddc.class = I2C_CLASS_DDC;
|
||||
snprintf(sdvo->ddc.name, I2C_NAME_SIZE, "SDVO DDC proxy");
|
||||
sdvo->ddc.dev.parent = dev->dev;
|
||||
sdvo->ddc.algo_data = sdvo;
|
||||
|
@ -81,7 +81,6 @@ int hibmc_ddc_create(struct drm_device *drm_dev,
|
||||
struct hibmc_connector *connector)
|
||||
{
|
||||
connector->adapter.owner = THIS_MODULE;
|
||||
connector->adapter.class = I2C_CLASS_DDC;
|
||||
snprintf(connector->adapter.name, I2C_NAME_SIZE, "HIS i2c bit bus");
|
||||
connector->adapter.dev.parent = drm_dev->dev;
|
||||
i2c_set_adapdata(&connector->adapter, connector);
|
||||
|
@ -899,7 +899,6 @@ int intel_gmbus_setup(struct drm_i915_private *i915)
|
||||
}
|
||||
|
||||
bus->adapter.owner = THIS_MODULE;
|
||||
bus->adapter.class = I2C_CLASS_DDC;
|
||||
snprintf(bus->adapter.name,
|
||||
sizeof(bus->adapter.name),
|
||||
"i915 gmbus %s", gmbus_pin->name);
|
||||
|
@ -3311,7 +3311,6 @@ intel_sdvo_init_ddc_proxy(struct intel_sdvo_ddc *ddc,
|
||||
ddc->ddc_bus = ddc_bus;
|
||||
|
||||
ddc->ddc.owner = THIS_MODULE;
|
||||
ddc->ddc.class = I2C_CLASS_DDC;
|
||||
snprintf(ddc->ddc.name, I2C_NAME_SIZE, "SDVO %c DDC%d",
|
||||
port_name(sdvo->base.port), ddc_bus);
|
||||
ddc->ddc.dev.parent = &pdev->dev;
|
||||
|
@ -154,7 +154,6 @@ int lsdc_create_i2c_chan(struct drm_device *ddev,
|
||||
adapter = &li2c->adapter;
|
||||
adapter->algo_data = &li2c->bit;
|
||||
adapter->owner = THIS_MODULE;
|
||||
adapter->class = I2C_CLASS_DDC;
|
||||
adapter->dev.parent = ddev->dev;
|
||||
adapter->nr = -1;
|
||||
|
||||
|
@ -297,7 +297,6 @@ static int mtk_hdmi_ddc_probe(struct platform_device *pdev)
|
||||
|
||||
strscpy(ddc->adap.name, "mediatek-hdmi-ddc", sizeof(ddc->adap.name));
|
||||
ddc->adap.owner = THIS_MODULE;
|
||||
ddc->adap.class = I2C_CLASS_DDC;
|
||||
ddc->adap.algo = &mtk_hdmi_ddc_algorithm;
|
||||
ddc->adap.retries = 3;
|
||||
ddc->adap.dev.of_node = dev->of_node;
|
||||
|
@ -106,7 +106,6 @@ int mgag200_i2c_init(struct mga_device *mdev, struct mga_i2c_chan *i2c)
|
||||
i2c->data = BIT(info->i2c.data_bit);
|
||||
i2c->clock = BIT(info->i2c.clock_bit);
|
||||
i2c->adapter.owner = THIS_MODULE;
|
||||
i2c->adapter.class = I2C_CLASS_DDC;
|
||||
i2c->adapter.dev.parent = dev->dev;
|
||||
i2c->dev = dev;
|
||||
i2c_set_adapdata(&i2c->adapter, i2c);
|
||||
|
@ -249,7 +249,6 @@ struct i2c_adapter *msm_hdmi_i2c_init(struct hdmi *hdmi)
|
||||
|
||||
|
||||
i2c->owner = THIS_MODULE;
|
||||
i2c->class = I2C_CLASS_DDC;
|
||||
snprintf(i2c->name, sizeof(i2c->name), "msm hdmi i2c");
|
||||
i2c->dev.parent = &hdmi->pdev->dev;
|
||||
i2c->algo = &msm_hdmi_i2c_algorithm;
|
||||
|
@ -918,7 +918,6 @@ struct radeon_i2c_chan *radeon_i2c_create(struct drm_device *dev,
|
||||
|
||||
i2c->rec = *rec;
|
||||
i2c->adapter.owner = THIS_MODULE;
|
||||
i2c->adapter.class = I2C_CLASS_DDC;
|
||||
i2c->adapter.dev.parent = dev->dev;
|
||||
i2c->dev = dev;
|
||||
i2c_set_adapdata(&i2c->adapter, i2c);
|
||||
|
@ -793,7 +793,6 @@ static struct i2c_adapter *inno_hdmi_i2c_adapter(struct inno_hdmi *hdmi)
|
||||
init_completion(&i2c->cmp);
|
||||
|
||||
adap = &i2c->adap;
|
||||
adap->class = I2C_CLASS_DDC;
|
||||
adap->owner = THIS_MODULE;
|
||||
adap->dev.parent = hdmi->dev;
|
||||
adap->dev.of_node = hdmi->dev->of_node;
|
||||
|
@ -725,7 +725,6 @@ static struct i2c_adapter *rk3066_hdmi_i2c_adapter(struct rk3066_hdmi *hdmi)
|
||||
init_completion(&i2c->cmpltn);
|
||||
|
||||
adap = &i2c->adap;
|
||||
adap->class = I2C_CLASS_DDC;
|
||||
adap->owner = THIS_MODULE;
|
||||
adap->dev.parent = hdmi->dev;
|
||||
adap->dev.of_node = hdmi->dev->of_node;
|
||||
|
@ -302,7 +302,6 @@ int sun4i_hdmi_i2c_create(struct device *dev, struct sun4i_hdmi *hdmi)
|
||||
return -ENOMEM;
|
||||
|
||||
adap->owner = THIS_MODULE;
|
||||
adap->class = I2C_CLASS_DDC;
|
||||
adap->algo = &sun4i_hdmi_i2c_algorithm;
|
||||
strscpy(adap->name, "sun4i_hdmi_i2c adapter", sizeof(adap->name));
|
||||
i2c_set_adapdata(adap, hdmi);
|
||||
|
Loading…
x
Reference in New Issue
Block a user