| Message ID | 20220118110928.120640-2-linus.walleij@linaro.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [1/3,v2] spi: s3c64xx: Delete unused boardfile helpers | expand |
On 18/01/2022 12:09, Linus Walleij wrote: > The SPI0 platform population function was taking a custom > gpio setup callback but the only user pass NULL as > argument so drop this argument. > > Cc: linux-samsung-soc@vger.kernel.org > Cc: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> > Cc: Sylwester Nawrocki <snawrocki@kernel.org> > Signed-off-by: Linus Walleij <linus.walleij@linaro.org> > --- > ChangeLog v1-v2: > - Split out to separate patch > --- > arch/arm/mach-s3c/devs.c | 5 ++--- > arch/arm/mach-s3c/mach-crag6410.c | 2 +- > include/linux/platform_data/spi-s3c64xx.h | 4 +--- > 3 files changed, 4 insertions(+), 7 deletions(-) > Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> Best regards, Krzysztof
On Tue, 18 Jan 2022 at 13:11, Linus Walleij <linus.walleij@linaro.org> wrote: > > The SPI0 platform population function was taking a custom > gpio setup callback but the only user pass NULL as > argument so drop this argument. > > Cc: linux-samsung-soc@vger.kernel.org > Cc: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> > Cc: Sylwester Nawrocki <snawrocki@kernel.org> > Signed-off-by: Linus Walleij <linus.walleij@linaro.org> > --- > ChangeLog v1-v2: > - Split out to separate patch > --- Reviewed-by: Sam Protsenko <semen.protsenko@linaro.org> > arch/arm/mach-s3c/devs.c | 5 ++--- > arch/arm/mach-s3c/mach-crag6410.c | 2 +- > include/linux/platform_data/spi-s3c64xx.h | 4 +--- > 3 files changed, 4 insertions(+), 7 deletions(-) > > diff --git a/arch/arm/mach-s3c/devs.c b/arch/arm/mach-s3c/devs.c > index 9f086aee862b..1e266fc24f9b 100644 > --- a/arch/arm/mach-s3c/devs.c > +++ b/arch/arm/mach-s3c/devs.c > @@ -1107,8 +1107,7 @@ struct platform_device s3c64xx_device_spi0 = { > }, > }; > > -void __init s3c64xx_spi0_set_platdata(int (*cfg_gpio)(void), int src_clk_nr, > - int num_cs) > +void __init s3c64xx_spi0_set_platdata(int src_clk_nr, int num_cs) > { > struct s3c64xx_spi_info pd; > > @@ -1120,7 +1119,7 @@ void __init s3c64xx_spi0_set_platdata(int (*cfg_gpio)(void), int src_clk_nr, > > pd.num_cs = num_cs; > pd.src_clk_nr = src_clk_nr; > - pd.cfg_gpio = (cfg_gpio) ? cfg_gpio : s3c64xx_spi0_cfg_gpio; > + pd.cfg_gpio = s3c64xx_spi0_cfg_gpio; > > s3c_set_platdata(&pd, sizeof(pd), &s3c64xx_device_spi0); > } > diff --git a/arch/arm/mach-s3c/mach-crag6410.c b/arch/arm/mach-s3c/mach-crag6410.c > index 4a12c75d407f..41f0aba2d2fd 100644 > --- a/arch/arm/mach-s3c/mach-crag6410.c > +++ b/arch/arm/mach-s3c/mach-crag6410.c > @@ -856,7 +856,7 @@ static void __init crag6410_machine_init(void) > i2c_register_board_info(1, i2c_devs1, ARRAY_SIZE(i2c_devs1)); > > samsung_keypad_set_platdata(&crag6410_keypad_data); > - s3c64xx_spi0_set_platdata(NULL, 0, 2); > + s3c64xx_spi0_set_platdata(0, 2); > > pwm_add_table(crag6410_pwm_lookup, ARRAY_SIZE(crag6410_pwm_lookup)); > platform_add_devices(crag6410_devices, ARRAY_SIZE(crag6410_devices)); > diff --git a/include/linux/platform_data/spi-s3c64xx.h b/include/linux/platform_data/spi-s3c64xx.h > index 19d690f34670..10890a4b55b9 100644 > --- a/include/linux/platform_data/spi-s3c64xx.h > +++ b/include/linux/platform_data/spi-s3c64xx.h > @@ -43,15 +43,13 @@ struct s3c64xx_spi_info { > /** > * s3c64xx_spi_set_platdata - SPI Controller configure callback by the board > * initialization code. > - * @cfg_gpio: Pointer to gpio setup function. > * @src_clk_nr: Clock the SPI controller is to use to generate SPI clocks. > * @num_cs: Number of elements in the 'cs' array. > * > * Call this from machine init code for each SPI Controller that > * has some chips attached to it. > */ > -extern void s3c64xx_spi0_set_platdata(int (*cfg_gpio)(void), int src_clk_nr, > - int num_cs); > +extern void s3c64xx_spi0_set_platdata(int src_clk_nr, int num_cs); > > /* defined by architecture to configure gpio */ > extern int s3c64xx_spi0_cfg_gpio(void); > -- > 2.34.1 >
diff --git a/arch/arm/mach-s3c/devs.c b/arch/arm/mach-s3c/devs.c index 9f086aee862b..1e266fc24f9b 100644 --- a/arch/arm/mach-s3c/devs.c +++ b/arch/arm/mach-s3c/devs.c @@ -1107,8 +1107,7 @@ struct platform_device s3c64xx_device_spi0 = { }, }; -void __init s3c64xx_spi0_set_platdata(int (*cfg_gpio)(void), int src_clk_nr, - int num_cs) +void __init s3c64xx_spi0_set_platdata(int src_clk_nr, int num_cs) { struct s3c64xx_spi_info pd; @@ -1120,7 +1119,7 @@ void __init s3c64xx_spi0_set_platdata(int (*cfg_gpio)(void), int src_clk_nr, pd.num_cs = num_cs; pd.src_clk_nr = src_clk_nr; - pd.cfg_gpio = (cfg_gpio) ? cfg_gpio : s3c64xx_spi0_cfg_gpio; + pd.cfg_gpio = s3c64xx_spi0_cfg_gpio; s3c_set_platdata(&pd, sizeof(pd), &s3c64xx_device_spi0); } diff --git a/arch/arm/mach-s3c/mach-crag6410.c b/arch/arm/mach-s3c/mach-crag6410.c index 4a12c75d407f..41f0aba2d2fd 100644 --- a/arch/arm/mach-s3c/mach-crag6410.c +++ b/arch/arm/mach-s3c/mach-crag6410.c @@ -856,7 +856,7 @@ static void __init crag6410_machine_init(void) i2c_register_board_info(1, i2c_devs1, ARRAY_SIZE(i2c_devs1)); samsung_keypad_set_platdata(&crag6410_keypad_data); - s3c64xx_spi0_set_platdata(NULL, 0, 2); + s3c64xx_spi0_set_platdata(0, 2); pwm_add_table(crag6410_pwm_lookup, ARRAY_SIZE(crag6410_pwm_lookup)); platform_add_devices(crag6410_devices, ARRAY_SIZE(crag6410_devices)); diff --git a/include/linux/platform_data/spi-s3c64xx.h b/include/linux/platform_data/spi-s3c64xx.h index 19d690f34670..10890a4b55b9 100644 --- a/include/linux/platform_data/spi-s3c64xx.h +++ b/include/linux/platform_data/spi-s3c64xx.h @@ -43,15 +43,13 @@ struct s3c64xx_spi_info { /** * s3c64xx_spi_set_platdata - SPI Controller configure callback by the board * initialization code. - * @cfg_gpio: Pointer to gpio setup function. * @src_clk_nr: Clock the SPI controller is to use to generate SPI clocks. * @num_cs: Number of elements in the 'cs' array. * * Call this from machine init code for each SPI Controller that * has some chips attached to it. */ -extern void s3c64xx_spi0_set_platdata(int (*cfg_gpio)(void), int src_clk_nr, - int num_cs); +extern void s3c64xx_spi0_set_platdata(int src_clk_nr, int num_cs); /* defined by architecture to configure gpio */ extern int s3c64xx_spi0_cfg_gpio(void);
The SPI0 platform population function was taking a custom gpio setup callback but the only user pass NULL as argument so drop this argument. Cc: linux-samsung-soc@vger.kernel.org Cc: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> Cc: Sylwester Nawrocki <snawrocki@kernel.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> --- ChangeLog v1-v2: - Split out to separate patch --- arch/arm/mach-s3c/devs.c | 5 ++--- arch/arm/mach-s3c/mach-crag6410.c | 2 +- include/linux/platform_data/spi-s3c64xx.h | 4 +--- 3 files changed, 4 insertions(+), 7 deletions(-)