From: Simon Glass Date: Thu, 15 Jun 2017 03:28:35 +0000 (-0600) Subject: dm: scsi: Indent the confusing #ifdefs X-Git-Tag: v2017.09-rc1~214^2~59 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=099c239d687cd48cc05f372b9f354ffcfeeba83c;p=u-boot dm: scsi: Indent the confusing #ifdefs These are very confusing without some sort of indentation. At some point we will be able to remove them, but for now, indent them. Signed-off-by: Simon Glass Reviewed-by: Bin Meng --- diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c index 2d0f81ad1f..e3d169045b 100644 --- a/drivers/scsi/scsi.c +++ b/drivers/scsi/scsi.c @@ -14,19 +14,19 @@ #include #if !defined(CONFIG_DM_SCSI) -#ifdef CONFIG_SCSI_DEV_LIST -#define SCSI_DEV_LIST CONFIG_SCSI_DEV_LIST -#else -#ifdef CONFIG_SATA_ULI5288 - -#define SCSI_VEND_ID 0x10b9 -#define SCSI_DEV_ID 0x5288 - -#elif !defined(CONFIG_SCSI_AHCI_PLAT) -#error no scsi device defined -#endif -#define SCSI_DEV_LIST {SCSI_VEND_ID, SCSI_DEV_ID} -#endif +# ifdef CONFIG_SCSI_DEV_LIST +# define SCSI_DEV_LIST CONFIG_SCSI_DEV_LIST +# else +# ifdef CONFIG_SATA_ULI5288 + +# define SCSI_VEND_ID 0x10b9 +# define SCSI_DEV_ID 0x5288 + +# elif !defined(CONFIG_SCSI_AHCI_PLAT) +# error no scsi device defined +# endif +# define SCSI_DEV_LIST {SCSI_VEND_ID, SCSI_DEV_ID} +# endif #endif #if defined(CONFIG_PCI) && !defined(CONFIG_SCSI_AHCI_PLAT)