| Message ID | 20190918140534.23365-1-kamel.bouhara@bootlin.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | pwm: atmel: Remove platform_device_id and use only dt bindings | expand |
Hi, On 18/09/2019 16:05:34+0200, Kamel Bouhara wrote: > Since commit 26202873bb51 ("avr32: remove support for AVR32 > architecture") there is no more user of platform_device_id and we > should only use dt bindings > > Signed-off-by: Kamel Bouhara <kamel.bouhara@bootlin.com> > --- > drivers/pwm/Kconfig | 2 +- > drivers/pwm/pwm-atmel.c | 29 +++-------------------------- > 2 files changed, 4 insertions(+), 27 deletions(-) > > diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig > index a7e57516959e..b51fb1a33aa2 100644 > --- a/drivers/pwm/Kconfig > +++ b/drivers/pwm/Kconfig > @@ -44,7 +44,7 @@ config PWM_AB8500 > > config PWM_ATMEL > tristate "Atmel PWM support" > - depends on ARCH_AT91 > + depends on ARCH_AT91 && OF > help > Generic PWM framework driver for Atmel SoC. > > diff --git a/drivers/pwm/pwm-atmel.c b/drivers/pwm/pwm-atmel.c > index e5e1eaf372fa..a3d93d634462 100644 > --- a/drivers/pwm/pwm-atmel.c > +++ b/drivers/pwm/pwm-atmel.c > @@ -318,19 +318,6 @@ static const struct atmel_pwm_data mchp_sam9x60_pwm_data = { > }, > }; > > -static const struct platform_device_id atmel_pwm_devtypes[] = { > - { > - .name = "at91sam9rl-pwm", > - .driver_data = (kernel_ulong_t)&atmel_sam9rl_pwm_data, > - }, { > - .name = "sama5d3-pwm", > - .driver_data = (kernel_ulong_t)&atmel_sama5_pwm_data, > - }, { > - /* sentinel */ > - }, > -}; > -MODULE_DEVICE_TABLE(platform, atmel_pwm_devtypes); > - > static const struct of_device_id atmel_pwm_dt_ids[] = { > { > .compatible = "atmel,at91sam9rl-pwm", > @@ -353,14 +340,7 @@ MODULE_DEVICE_TABLE(of, atmel_pwm_dt_ids); > static inline const struct atmel_pwm_data * > atmel_pwm_get_driver_data(struct platform_device *pdev) > { > - const struct platform_device_id *id; > - > - if (pdev->dev.of_node) > - return of_device_get_match_data(&pdev->dev); > - > - id = platform_get_device_id(pdev); > - > - return (struct atmel_pwm_data *)id->driver_data; > + return of_device_get_match_data(&pdev->dev); The whole function is gone so you could simply call of_device_get_match_data from atmel_pwm_probe. > } > > static int atmel_pwm_probe(struct platform_device *pdev) > @@ -396,10 +376,8 @@ static int atmel_pwm_probe(struct platform_device *pdev) > atmel_pwm->chip.dev = &pdev->dev; > atmel_pwm->chip.ops = &atmel_pwm_ops; > > - if (pdev->dev.of_node) { > - atmel_pwm->chip.of_xlate = of_pwm_xlate_with_flags; > - atmel_pwm->chip.of_pwm_n_cells = 3; > - } > + atmel_pwm->chip.of_xlate = of_pwm_xlate_with_flags; > + atmel_pwm->chip.of_pwm_n_cells = 3; > > atmel_pwm->chip.base = -1; > atmel_pwm->chip.npwm = 4; > @@ -437,7 +415,6 @@ static struct platform_driver atmel_pwm_driver = { > .name = "atmel-pwm", > .of_match_table = of_match_ptr(atmel_pwm_dt_ids), > }, > - .id_table = atmel_pwm_devtypes, > .probe = atmel_pwm_probe, > .remove = atmel_pwm_remove, > }; > -- > 2.23.0 >
diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig index a7e57516959e..b51fb1a33aa2 100644 --- a/drivers/pwm/Kconfig +++ b/drivers/pwm/Kconfig @@ -44,7 +44,7 @@ config PWM_AB8500 config PWM_ATMEL tristate "Atmel PWM support" - depends on ARCH_AT91 + depends on ARCH_AT91 && OF help Generic PWM framework driver for Atmel SoC. diff --git a/drivers/pwm/pwm-atmel.c b/drivers/pwm/pwm-atmel.c index e5e1eaf372fa..a3d93d634462 100644 --- a/drivers/pwm/pwm-atmel.c +++ b/drivers/pwm/pwm-atmel.c @@ -318,19 +318,6 @@ static const struct atmel_pwm_data mchp_sam9x60_pwm_data = { }, }; -static const struct platform_device_id atmel_pwm_devtypes[] = { - { - .name = "at91sam9rl-pwm", - .driver_data = (kernel_ulong_t)&atmel_sam9rl_pwm_data, - }, { - .name = "sama5d3-pwm", - .driver_data = (kernel_ulong_t)&atmel_sama5_pwm_data, - }, { - /* sentinel */ - }, -}; -MODULE_DEVICE_TABLE(platform, atmel_pwm_devtypes); - static const struct of_device_id atmel_pwm_dt_ids[] = { { .compatible = "atmel,at91sam9rl-pwm", @@ -353,14 +340,7 @@ MODULE_DEVICE_TABLE(of, atmel_pwm_dt_ids); static inline const struct atmel_pwm_data * atmel_pwm_get_driver_data(struct platform_device *pdev) { - const struct platform_device_id *id; - - if (pdev->dev.of_node) - return of_device_get_match_data(&pdev->dev); - - id = platform_get_device_id(pdev); - - return (struct atmel_pwm_data *)id->driver_data; + return of_device_get_match_data(&pdev->dev); } static int atmel_pwm_probe(struct platform_device *pdev) @@ -396,10 +376,8 @@ static int atmel_pwm_probe(struct platform_device *pdev) atmel_pwm->chip.dev = &pdev->dev; atmel_pwm->chip.ops = &atmel_pwm_ops; - if (pdev->dev.of_node) { - atmel_pwm->chip.of_xlate = of_pwm_xlate_with_flags; - atmel_pwm->chip.of_pwm_n_cells = 3; - } + atmel_pwm->chip.of_xlate = of_pwm_xlate_with_flags; + atmel_pwm->chip.of_pwm_n_cells = 3; atmel_pwm->chip.base = -1; atmel_pwm->chip.npwm = 4; @@ -437,7 +415,6 @@ static struct platform_driver atmel_pwm_driver = { .name = "atmel-pwm", .of_match_table = of_match_ptr(atmel_pwm_dt_ids), }, - .id_table = atmel_pwm_devtypes, .probe = atmel_pwm_probe, .remove = atmel_pwm_remove, };
Since commit 26202873bb51 ("avr32: remove support for AVR32 architecture") there is no more user of platform_device_id and we should only use dt bindings Signed-off-by: Kamel Bouhara <kamel.bouhara@bootlin.com> --- drivers/pwm/Kconfig | 2 +- drivers/pwm/pwm-atmel.c | 29 +++-------------------------- 2 files changed, 4 insertions(+), 27 deletions(-)