| Message ID | 1476785398-27255-1-git-send-email-shajit@codeaurora.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Jitendra, Thank you for the patch. On Tuesday 18 Oct 2016 15:39:58 Jitendra Sharma wrote: > Remove unused id_table entries > Currently this driver supports only device tree based configuration. > So, no need in keeping the id_table entries > > Remove redundant condition check > Remove not necessary if-else block for checking DT entry because else > part will never be picked as in absence of device node, probe will > fail in initial stage only. > > Signed-off-by: Jitendra Sharma <shajit@codeaurora.org> > --- > drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 17 +---------------- > 1 file changed, 1 insertion(+), 16 deletions(-) > > diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c > b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c index 8ed3906..44eea5c > 100644 > --- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c > +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c > @@ -942,10 +942,7 @@ static int adv7511_probe(struct i2c_client *i2c, const > struct i2c_device_id *id) adv7511->powered = false; > adv7511->status = connector_status_disconnected; > > - if (dev->of_node) > - adv7511->type = (enum adv7511_type)of_device_get_match_data(dev); > - else > - adv7511->type = id->driver_data; > + adv7511->type = (enum adv7511_type)of_device_get_match_data(dev); > > memset(&link_config, 0, sizeof(link_config)); > > @@ -1065,17 +1062,6 @@ static int adv7511_remove(struct i2c_client *i2c) > return 0; > } > > -static const struct i2c_device_id adv7511_i2c_ids[] = { > - { "adv7511", ADV7511 }, > - { "adv7511w", ADV7511 }, > - { "adv7513", ADV7511 }, > -#ifdef CONFIG_DRM_I2C_ADV7533 > - { "adv7533", ADV7533 }, > -#endif > - { } > -}; > -MODULE_DEVICE_TABLE(i2c, adv7511_i2c_ids); > - > static const struct of_device_id adv7511_of_ids[] = { > { .compatible = "adi,adv7511", .data = (void *)ADV7511 }, > { .compatible = "adi,adv7511w", .data = (void *)ADV7511 }, > @@ -1096,7 +1082,6 @@ static int adv7511_remove(struct i2c_client *i2c) > .name = "adv7511", > .of_match_table = adv7511_of_ids, > }, > - .id_table = adv7511_i2c_ids, Have you tested this ? With your patch applied the OF-instantiated adv7611w is never probed on my system. > .probe = adv7511_probe, > .remove = adv7511_remove, > };
Hi Laurent, Thanks for trying it out. On 10/18/2016 6:37 PM, Laurent Pinchart wrote: > Hi Jitendra, > > Thank you for the patch. > > On Tuesday 18 Oct 2016 15:39:58 Jitendra Sharma wrote: >> Remove unused id_table entries >> Currently this driver supports only device tree based configuration. >> So, no need in keeping the id_table entries >> >> Remove redundant condition check >> Remove not necessary if-else block for checking DT entry because else >> part will never be picked as in absence of device node, probe will >> fail in initial stage only. >> >> Signed-off-by: Jitendra Sharma <shajit@codeaurora.org> >> --- >> drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 17 +---------------- >> 1 file changed, 1 insertion(+), 16 deletions(-) >> >> diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c >> b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c index 8ed3906..44eea5c >> 100644 >> --- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c >> +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c >> @@ -942,10 +942,7 @@ static int adv7511_probe(struct i2c_client *i2c, const >> struct i2c_device_id *id) adv7511->powered = false; >> adv7511->status = connector_status_disconnected; >> >> - if (dev->of_node) >> - adv7511->type = (enum > adv7511_type)of_device_get_match_data(dev); >> - else >> - adv7511->type = id->driver_data; >> + adv7511->type = (enum adv7511_type)of_device_get_match_data(dev); >> >> memset(&link_config, 0, sizeof(link_config)); >> >> @@ -1065,17 +1062,6 @@ static int adv7511_remove(struct i2c_client *i2c) >> return 0; >> } >> >> -static const struct i2c_device_id adv7511_i2c_ids[] = { >> - { "adv7511", ADV7511 }, >> - { "adv7511w", ADV7511 }, >> - { "adv7513", ADV7511 }, >> -#ifdef CONFIG_DRM_I2C_ADV7533 >> - { "adv7533", ADV7533 }, >> -#endif >> - { } >> -}; >> -MODULE_DEVICE_TABLE(i2c, adv7511_i2c_ids); >> - >> static const struct of_device_id adv7511_of_ids[] = { >> { .compatible = "adi,adv7511", .data = (void *)ADV7511 }, >> { .compatible = "adi,adv7511w", .data = (void *)ADV7511 }, >> @@ -1096,7 +1082,6 @@ static int adv7511_remove(struct i2c_client *i2c) >> .name = "adv7511", >> .of_match_table = adv7511_of_ids, >> }, >> - .id_table = adv7511_i2c_ids, > Have you tested this ? With your patch applied the OF-instantiated adv7611w is > never probed on my system. Will look into it > >> .probe = adv7511_probe, >> .remove = adv7511_remove, >> };
diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c index 8ed3906..44eea5c 100644 --- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c @@ -942,10 +942,7 @@ static int adv7511_probe(struct i2c_client *i2c, const struct i2c_device_id *id) adv7511->powered = false; adv7511->status = connector_status_disconnected; - if (dev->of_node) - adv7511->type = (enum adv7511_type)of_device_get_match_data(dev); - else - adv7511->type = id->driver_data; + adv7511->type = (enum adv7511_type)of_device_get_match_data(dev); memset(&link_config, 0, sizeof(link_config)); @@ -1065,17 +1062,6 @@ static int adv7511_remove(struct i2c_client *i2c) return 0; } -static const struct i2c_device_id adv7511_i2c_ids[] = { - { "adv7511", ADV7511 }, - { "adv7511w", ADV7511 }, - { "adv7513", ADV7511 }, -#ifdef CONFIG_DRM_I2C_ADV7533 - { "adv7533", ADV7533 }, -#endif - { } -}; -MODULE_DEVICE_TABLE(i2c, adv7511_i2c_ids); - static const struct of_device_id adv7511_of_ids[] = { { .compatible = "adi,adv7511", .data = (void *)ADV7511 }, { .compatible = "adi,adv7511w", .data = (void *)ADV7511 }, @@ -1096,7 +1082,6 @@ static int adv7511_remove(struct i2c_client *i2c) .name = "adv7511", .of_match_table = adv7511_of_ids, }, - .id_table = adv7511_i2c_ids, .probe = adv7511_probe, .remove = adv7511_remove, };
Remove unused id_table entries Currently this driver supports only device tree based configuration. So, no need in keeping the id_table entries Remove redundant condition check Remove not necessary if-else block for checking DT entry because else part will never be picked as in absence of device node, probe will fail in initial stage only. Signed-off-by: Jitendra Sharma <shajit@codeaurora.org> --- drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-)