Re: [PATCH 1/3 v2] spi: s3c64xx: Delete unused boardfile helpers

[Sam Protsenko <semen.protsenko@xxxxxxxxxx>]

On Tue, 18 Jan 2022 at 13:11, Linus Walleij <linus.walleij@xxxxxxxxxx> wrote:
>
> The helpers to use SPI host 1 and 2 are unused in the kernel
> and taking up space and maintenance hours. New systems should
> use device tree and not this, so delete the code.
>
> Cc: linux-samsung-soc@xxxxxxxxxxxxxxx
> Cc: Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxxxxx>
> Cc: Sylwester Nawrocki <snawrocki@xxxxxxxxxx>
> Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxx>
> ---
> ChangeLog v1-v2:
> - Split out to separate patch
> ---

Reviewed-by: Sam Protsenko <semen.protsenko@xxxxxxxxxx>

>  arch/arm/mach-s3c/Kconfig                 | 12 ----
>  arch/arm/mach-s3c/devs.c                  | 72 -----------------------
>  arch/arm/mach-s3c/setup-spi-s3c64xx.c     |  9 ---
>  arch/arm/mach-s3c/spi-core-s3c24xx.h      |  6 --
>  include/linux/platform_data/spi-s3c64xx.h |  8 ---
>  5 files changed, 107 deletions(-)
>
> diff --git a/arch/arm/mach-s3c/Kconfig b/arch/arm/mach-s3c/Kconfig
> index 25606e668cf9..1899fc3f44fd 100644
> --- a/arch/arm/mach-s3c/Kconfig
> +++ b/arch/arm/mach-s3c/Kconfig
> @@ -191,18 +191,6 @@ config S3C64XX_DEV_SPI0
>           Compile in platform device definitions for S3C64XX's type
>           SPI controller 0
>
> -config S3C64XX_DEV_SPI1
> -       bool
> -       help
> -         Compile in platform device definitions for S3C64XX's type
> -         SPI controller 1
> -
> -config S3C64XX_DEV_SPI2
> -       bool
> -       help
> -         Compile in platform device definitions for S3C64XX's type
> -         SPI controller 2
> -
>  config SAMSUNG_DEV_TS
>         bool
>         help
> diff --git a/arch/arm/mach-s3c/devs.c b/arch/arm/mach-s3c/devs.c
> index 06dec64848f9..9f086aee862b 100644
> --- a/arch/arm/mach-s3c/devs.c
> +++ b/arch/arm/mach-s3c/devs.c
> @@ -1125,75 +1125,3 @@ void __init s3c64xx_spi0_set_platdata(int (*cfg_gpio)(void), int src_clk_nr,
>         s3c_set_platdata(&pd, sizeof(pd), &s3c64xx_device_spi0);
>  }
>  #endif /* CONFIG_S3C64XX_DEV_SPI0 */
> -
> -#ifdef CONFIG_S3C64XX_DEV_SPI1
> -static struct resource s3c64xx_spi1_resource[] = {
> -       [0] = DEFINE_RES_MEM(S3C_PA_SPI1, SZ_256),
> -       [1] = DEFINE_RES_IRQ(IRQ_SPI1),
> -};
> -
> -struct platform_device s3c64xx_device_spi1 = {
> -       .name           = "s3c6410-spi",
> -       .id             = 1,
> -       .num_resources  = ARRAY_SIZE(s3c64xx_spi1_resource),
> -       .resource       = s3c64xx_spi1_resource,
> -       .dev = {
> -               .dma_mask               = &samsung_device_dma_mask,
> -               .coherent_dma_mask      = DMA_BIT_MASK(32),
> -       },
> -};
> -
> -void __init s3c64xx_spi1_set_platdata(int (*cfg_gpio)(void), int src_clk_nr,
> -                                               int num_cs)
> -{
> -       struct s3c64xx_spi_info pd;
> -
> -       /* Reject invalid configuration */
> -       if (!num_cs || src_clk_nr < 0) {
> -               pr_err("%s: Invalid SPI configuration\n", __func__);
> -               return;
> -       }
> -
> -       pd.num_cs = num_cs;
> -       pd.src_clk_nr = src_clk_nr;
> -       pd.cfg_gpio = (cfg_gpio) ? cfg_gpio : s3c64xx_spi1_cfg_gpio;
> -
> -       s3c_set_platdata(&pd, sizeof(pd), &s3c64xx_device_spi1);
> -}
> -#endif /* CONFIG_S3C64XX_DEV_SPI1 */
> -
> -#ifdef CONFIG_S3C64XX_DEV_SPI2
> -static struct resource s3c64xx_spi2_resource[] = {
> -       [0] = DEFINE_RES_MEM(S3C_PA_SPI2, SZ_256),
> -       [1] = DEFINE_RES_IRQ(IRQ_SPI2),
> -};
> -
> -struct platform_device s3c64xx_device_spi2 = {
> -       .name           = "s3c6410-spi",
> -       .id             = 2,
> -       .num_resources  = ARRAY_SIZE(s3c64xx_spi2_resource),
> -       .resource       = s3c64xx_spi2_resource,
> -       .dev = {
> -               .dma_mask               = &samsung_device_dma_mask,
> -               .coherent_dma_mask      = DMA_BIT_MASK(32),
> -       },
> -};
> -
> -void __init s3c64xx_spi2_set_platdata(int (*cfg_gpio)(void), int src_clk_nr,
> -                                               int num_cs)
> -{
> -       struct s3c64xx_spi_info pd;
> -
> -       /* Reject invalid configuration */
> -       if (!num_cs || src_clk_nr < 0) {
> -               pr_err("%s: Invalid SPI configuration\n", __func__);
> -               return;
> -       }
> -
> -       pd.num_cs = num_cs;
> -       pd.src_clk_nr = src_clk_nr;
> -       pd.cfg_gpio = (cfg_gpio) ? cfg_gpio : s3c64xx_spi2_cfg_gpio;
> -
> -       s3c_set_platdata(&pd, sizeof(pd), &s3c64xx_device_spi2);
> -}
> -#endif /* CONFIG_S3C64XX_DEV_SPI2 */
> diff --git a/arch/arm/mach-s3c/setup-spi-s3c64xx.c b/arch/arm/mach-s3c/setup-spi-s3c64xx.c
> index efcf78d41585..497aff71c29c 100644
> --- a/arch/arm/mach-s3c/setup-spi-s3c64xx.c
> +++ b/arch/arm/mach-s3c/setup-spi-s3c64xx.c
> @@ -16,12 +16,3 @@ int s3c64xx_spi0_cfg_gpio(void)
>         return 0;
>  }
>  #endif
> -
> -#ifdef CONFIG_S3C64XX_DEV_SPI1
> -int s3c64xx_spi1_cfg_gpio(void)
> -{
> -       s3c_gpio_cfgall_range(S3C64XX_GPC(4), 3,
> -                               S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);
> -       return 0;
> -}
> -#endif
> diff --git a/arch/arm/mach-s3c/spi-core-s3c24xx.h b/arch/arm/mach-s3c/spi-core-s3c24xx.h
> index 057667469cc3..919c5fd0c9af 100644
> --- a/arch/arm/mach-s3c/spi-core-s3c24xx.h
> +++ b/arch/arm/mach-s3c/spi-core-s3c24xx.h
> @@ -16,12 +16,6 @@ static inline void s3c24xx_spi_setname(char *name)
>  #ifdef CONFIG_S3C64XX_DEV_SPI0
>         s3c64xx_device_spi0.name = name;
>  #endif
> -#ifdef CONFIG_S3C64XX_DEV_SPI1
> -       s3c64xx_device_spi1.name = name;
> -#endif
> -#ifdef CONFIG_S3C64XX_DEV_SPI2
> -       s3c64xx_device_spi2.name = name;
> -#endif
>  }
>
>  #endif /* __PLAT_S3C_SPI_CORE_S3C24XX_H */
> diff --git a/include/linux/platform_data/spi-s3c64xx.h b/include/linux/platform_data/spi-s3c64xx.h
> index 773daf7915a3..19d690f34670 100644
> --- a/include/linux/platform_data/spi-s3c64xx.h
> +++ b/include/linux/platform_data/spi-s3c64xx.h
> @@ -52,17 +52,9 @@ struct s3c64xx_spi_info {
>   */
>  extern void s3c64xx_spi0_set_platdata(int (*cfg_gpio)(void), int src_clk_nr,
>                                                 int num_cs);
> -extern void s3c64xx_spi1_set_platdata(int (*cfg_gpio)(void), int src_clk_nr,
> -                                               int num_cs);
> -extern void s3c64xx_spi2_set_platdata(int (*cfg_gpio)(void), int src_clk_nr,
> -                                               int num_cs);
>
>  /* defined by architecture to configure gpio */
>  extern int s3c64xx_spi0_cfg_gpio(void);
> -extern int s3c64xx_spi1_cfg_gpio(void);
> -extern int s3c64xx_spi2_cfg_gpio(void);
>
>  extern struct s3c64xx_spi_info s3c64xx_spi0_pdata;
> -extern struct s3c64xx_spi_info s3c64xx_spi1_pdata;
> -extern struct s3c64xx_spi_info s3c64xx_spi2_pdata;
>  #endif /*__SPI_S3C64XX_H */
> --
> 2.34.1
>