[PATCH 2/8] sata: Only support BLK

[Stefan Roese]

On 1/31/22 15:49, Simon Glass wrote:
> No boards currently use SATA without BLK:
> 
>     ./tools/moveconfig.py -f SATA ~BLK
>     0 matches
> 
> Make SATA depend on BLK to avoid any future confusion. Drop the dead code.
> 
> Signed-off-by: Simon Glass <sjg at chromium.org>

Reviewed-by: Stefan Roese <sr at denx.de>

Thanks,
Stefan

> ---
> 
>   drivers/ata/Kconfig |  4 +---
>   drivers/ata/sata.c  | 27 ---------------------------
>   2 files changed, 1 insertion(+), 30 deletions(-)
> 
> diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
> index f9978a35796..1def9305dd5 100644
> --- a/drivers/ata/Kconfig
> +++ b/drivers/ata/Kconfig
> @@ -9,6 +9,7 @@ config AHCI
>   
>   config SATA
>   	bool "Support SATA controllers"
> +	depends on BLK
>   	select HAVE_BLOCK_DEVICE
>   	help
>   	  This enables support for SATA (Serial Advanced Technology
> @@ -86,7 +87,6 @@ config FSL_SATA
>   	bool "Enable Freescale SATA controller driver support"
>   	select AHCI
>   	select LIBATA
> -	depends on BLK
>   	help
>   	  Enable this driver to support the SATA controller found in
>   	  some Freescale PowerPC SoCs.
> @@ -95,7 +95,6 @@ config SATA_MV
>   	bool "Enable Marvell SATA controller driver support"
>   	select AHCI
>   	select LIBATA
> -	depends on BLK
>   	help
>   	  Enable this driver to support the SATA controller found in
>   	  some Marvell SoCs.
> @@ -104,7 +103,6 @@ config SATA_SIL
>   	bool "Enable Silicon Image SIL3131 / SIL3132 / SIL3124 SATA driver support"
>   	select AHCI
>   	select LIBATA
> -	depends on BLK
>   	help
>   	  Enable this driver to support the SIL3131, SIL3132 and SIL3124
>   	  SATA controllers.
> diff --git a/drivers/ata/sata.c b/drivers/ata/sata.c
> index 6a38d500245..0e6c8cdd422 100644
> --- a/drivers/ata/sata.c
> +++ b/drivers/ata/sata.c
> @@ -59,7 +59,6 @@ struct blk_desc *sata_get_dev(int dev)
>   #endif
>   #endif
>   
> -#ifdef CONFIG_BLK
>   static unsigned long sata_bread(struct udevice *dev, lbaint_t start,
>   				lbaint_t blkcnt, void *dst)
>   {
> @@ -71,19 +70,6 @@ static unsigned long sata_bwrite(struct udevice *dev, lbaint_t start,
>   {
>   	return -ENOSYS;
>   }
> -#else
> -static unsigned long sata_bread(struct blk_desc *block_dev, lbaint_t start,
> -				lbaint_t blkcnt, void *dst)
> -{
> -	return sata_read(block_dev->devnum, start, blkcnt, dst);
> -}
> -
> -static unsigned long sata_bwrite(struct blk_desc *block_dev, lbaint_t start,
> -				 lbaint_t blkcnt, const void *buffer)
> -{
> -	return sata_write(block_dev->devnum, start, blkcnt, buffer);
> -}
> -#endif
>   
>   #ifndef CONFIG_AHCI
>   int __sata_initialize(void)
> @@ -100,10 +86,6 @@ int __sata_initialize(void)
>   		sata_dev_desc[i].lba = 0;
>   		sata_dev_desc[i].blksz = 512;
>   		sata_dev_desc[i].log2blksz = LOG2(sata_dev_desc[i].blksz);
> -#ifndef CONFIG_BLK
> -		sata_dev_desc[i].block_read = sata_bread;
> -		sata_dev_desc[i].block_write = sata_bwrite;
> -#endif
>   		rc = init_sata(i);
>   		if (!rc) {
>   			rc = scan_sata(i);
> @@ -134,7 +116,6 @@ __weak int __sata_stop(void)
>   int sata_stop(void) __attribute__((weak, alias("__sata_stop")));
>   #endif
>   
> -#ifdef CONFIG_BLK
>   static const struct blk_ops sata_blk_ops = {
>   	.read	= sata_bread,
>   	.write	= sata_bwrite,
> @@ -145,11 +126,3 @@ U_BOOT_DRIVER(sata_blk) = {
>   	.id		= UCLASS_BLK,
>   	.ops		= &sata_blk_ops,
>   };
> -#else
> -U_BOOT_LEGACY_BLK(sata) = {
> -	.if_typename	= "sata",
> -	.if_type	= IF_TYPE_SATA,
> -	.max_devs	= CONFIG_SYS_SATA_MAX_DEVICE,
> -	.desc		= sata_dev_desc,
> -};
> -#endif

Viele Grüße,
Stefan Roese

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de