| Message ID | 20240126171546.1233172-7-tudor.ambarus@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | spi: s3c64xx: straightforward cleanup | expand |
On Fri, Jan 26, 2024 at 11:15 AM Tudor Ambarus <tudor.ambarus@linaro.org> wrote: > > of_device_id::data is an opaque pointer. No explicit cast is needed. > Remove unneeded (void *) casts in of_match_table. While here align the > compatible and data members. > > Reviewed-by: Andi Shyti <andi.shyti@kernel.org> > Signed-off-by: Tudor Ambarus <tudor.ambarus@linaro.org> > --- > drivers/spi/spi-s3c64xx.c | 45 +++++++++++++++++++++++---------------- > 1 file changed, 27 insertions(+), 18 deletions(-) > > diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c > index ccb700312d64..9bf54c1044b3 100644 > --- a/drivers/spi/spi-s3c64xx.c > +++ b/drivers/spi/spi-s3c64xx.c > @@ -1511,32 +1511,41 @@ static const struct platform_device_id s3c64xx_spi_driver_ids[] = { > }; > > static const struct of_device_id s3c64xx_spi_dt_match[] = { > - { .compatible = "samsung,s3c2443-spi", > - .data = (void *)&s3c2443_spi_port_config, > + { > + .compatible = "samsung,s3c2443-spi", > + .data = &s3c2443_spi_port_config, > }, > - { .compatible = "samsung,s3c6410-spi", > - .data = (void *)&s3c6410_spi_port_config, > + { The braces style is not fixed. Yet that's a style patch, which on one hand fixes the issue (unnecessary void * cast), but OTOH brings another issue (non-canonical braces placement). Please see my comments for your previous submission. > + .compatible = "samsung,s3c6410-spi", > + .data = &s3c6410_spi_port_config, > }, > - { .compatible = "samsung,s5pv210-spi", > - .data = (void *)&s5pv210_spi_port_config, > + { > + .compatible = "samsung,s5pv210-spi", > + .data = &s5pv210_spi_port_config, > }, > - { .compatible = "samsung,exynos4210-spi", > - .data = (void *)&exynos4_spi_port_config, > + { > + .compatible = "samsung,exynos4210-spi", > + .data = &exynos4_spi_port_config, > }, > - { .compatible = "samsung,exynos7-spi", > - .data = (void *)&exynos7_spi_port_config, > + { > + .compatible = "samsung,exynos7-spi", > + .data = &exynos7_spi_port_config, > }, > - { .compatible = "samsung,exynos5433-spi", > - .data = (void *)&exynos5433_spi_port_config, > + { > + .compatible = "samsung,exynos5433-spi", > + .data = &exynos5433_spi_port_config, > }, > - { .compatible = "samsung,exynos850-spi", > - .data = (void *)&exynos850_spi_port_config, > + { > + .compatible = "samsung,exynos850-spi", > + .data = &exynos850_spi_port_config, > }, > - { .compatible = "samsung,exynosautov9-spi", > - .data = (void *)&exynosautov9_spi_port_config, > + { > + .compatible = "samsung,exynosautov9-spi", > + .data = &exynosautov9_spi_port_config, > }, > - { .compatible = "tesla,fsd-spi", > - .data = (void *)&fsd_spi_port_config, > + { > + .compatible = "tesla,fsd-spi", > + .data = &fsd_spi_port_config, > }, > { }, > }; > -- > 2.43.0.429.g432eaa2c6b-goog >
Hi, Sam, Thanks for the review feedback. On 1/26/24 20:17, Sam Protsenko wrote: >> static const struct of_device_id s3c64xx_spi_dt_match[] = { >> - { .compatible = "samsung,s3c2443-spi", >> - .data = (void *)&s3c2443_spi_port_config, >> + { >> + .compatible = "samsung,s3c2443-spi", >> + .data = &s3c2443_spi_port_config, >> }, >> - { .compatible = "samsung,s3c6410-spi", >> - .data = (void *)&s3c6410_spi_port_config, >> + { > The braces style is not fixed. Yet that's a style patch, which on one > hand fixes the issue (unnecessary void * cast), but OTOH brings > another issue (non-canonical braces placement). Please see my comments > for your previous submission. I've read your email and replied there that the braces were one on top of the other even before my patch and since I don't have a preference on whether to choose a style or the other, I kept the style as it were. But I learnt my lesson. Mark can ignore this path when applying and I'll submit a new version of the patch where I'll refrain myself making alignments or changing the style. Cheers, ta
diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c index ccb700312d64..9bf54c1044b3 100644 --- a/drivers/spi/spi-s3c64xx.c +++ b/drivers/spi/spi-s3c64xx.c @@ -1511,32 +1511,41 @@ static const struct platform_device_id s3c64xx_spi_driver_ids[] = { }; static const struct of_device_id s3c64xx_spi_dt_match[] = { - { .compatible = "samsung,s3c2443-spi", - .data = (void *)&s3c2443_spi_port_config, + { + .compatible = "samsung,s3c2443-spi", + .data = &s3c2443_spi_port_config, }, - { .compatible = "samsung,s3c6410-spi", - .data = (void *)&s3c6410_spi_port_config, + { + .compatible = "samsung,s3c6410-spi", + .data = &s3c6410_spi_port_config, }, - { .compatible = "samsung,s5pv210-spi", - .data = (void *)&s5pv210_spi_port_config, + { + .compatible = "samsung,s5pv210-spi", + .data = &s5pv210_spi_port_config, }, - { .compatible = "samsung,exynos4210-spi", - .data = (void *)&exynos4_spi_port_config, + { + .compatible = "samsung,exynos4210-spi", + .data = &exynos4_spi_port_config, }, - { .compatible = "samsung,exynos7-spi", - .data = (void *)&exynos7_spi_port_config, + { + .compatible = "samsung,exynos7-spi", + .data = &exynos7_spi_port_config, }, - { .compatible = "samsung,exynos5433-spi", - .data = (void *)&exynos5433_spi_port_config, + { + .compatible = "samsung,exynos5433-spi", + .data = &exynos5433_spi_port_config, }, - { .compatible = "samsung,exynos850-spi", - .data = (void *)&exynos850_spi_port_config, + { + .compatible = "samsung,exynos850-spi", + .data = &exynos850_spi_port_config, }, - { .compatible = "samsung,exynosautov9-spi", - .data = (void *)&exynosautov9_spi_port_config, + { + .compatible = "samsung,exynosautov9-spi", + .data = &exynosautov9_spi_port_config, }, - { .compatible = "tesla,fsd-spi", - .data = (void *)&fsd_spi_port_config, + { + .compatible = "tesla,fsd-spi", + .data = &fsd_spi_port_config, }, { }, };