scsi: ufs: Remove the UFS_FIX() and END_FIX() macros

Since these two macros reduce code readability, remove them.

Link: https://lore.kernel.org/r/20220419225811.4127248-9-bvanassche@acm.org
Tested-by: Bean Huo <beanhuo@micron.com>
Reviewed-by: Avri Altman <avri.altman@wdc.com>
Reviewed-by: Bean Huo <beanhuo@micron.com>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/ufs/ufs-mediatek.c b/drivers/scsi/ufs/ufs-mediatek.c
index 86a938075f308bd41d568127b93214fb129154e2..b275b440f02702707a5a1ee7cc81bca1474b079a 100644 (file)
--- a/drivers/scsi/ufs/ufs-mediatek.c
+++ b/drivers/scsi/ufs/ufs-mediatek.c
@@ -45,11 +45,13 @@
        ufs_mtk_smc(UFS_MTK_SIP_DEVICE_RESET, high, res)
 
 static struct ufs_dev_fix ufs_mtk_dev_fixups[] = {
-       UFS_FIX(UFS_VENDOR_MICRON, UFS_ANY_MODEL,
-               UFS_DEVICE_QUIRK_DELAY_AFTER_LPM),
-       UFS_FIX(UFS_VENDOR_SKHYNIX, "H9HQ21AFAMZDAR",
-               UFS_DEVICE_QUIRK_SUPPORT_EXTENDED_FEATURES),
-       END_FIX
+       { .wmanufacturerid = UFS_VENDOR_MICRON,
+         .model = UFS_ANY_MODEL,
+         .quirk = UFS_DEVICE_QUIRK_DELAY_AFTER_LPM },
+       { .wmanufacturerid = UFS_VENDOR_SKHYNIX,
+         .model = "H9HQ21AFAMZDAR",
+         .quirk = UFS_DEVICE_QUIRK_SUPPORT_EXTENDED_FEATURES },
+       {}
 };
 
 static const struct of_device_id ufs_mtk_of_match[] = {

diff --git a/drivers/scsi/ufs/ufs_quirks.h b/drivers/scsi/ufs/ufs_quirks.h
index 35ec9ea79869af3c69e1c5fd7eccab81da528b32..e6c535c775276c18bfd1e400b08e98742b0bb54a 100644 (file)
--- a/drivers/scsi/ufs/ufs_quirks.h
+++ b/drivers/scsi/ufs/ufs_quirks.h
@@ -29,15 +29,6 @@ struct ufs_dev_fix {
        unsigned int quirk;
 };
 
-#define END_FIX { }
-
-/* add specific device quirk */
-#define UFS_FIX(_vendor, _model, _quirk) { \
-       .wmanufacturerid = (_vendor),\
-       .model = (_model),                 \
-       .quirk = (_quirk),                 \
-}
-
 /*
  * Some vendor's UFS device sends back to back NACs for the DL data frames
  * causing the host controller to raise the DFES error status. Sometimes

diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
index e400f28e54a3fd0ac6a9b2fa80a4d8f0eab06549..23a1b71e0e584f7433d60df32db2c35edbcc65e0 100644 (file)
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@ -206,24 +206,31 @@ ufs_get_desired_pm_lvl_for_dev_link_state(enum ufs_dev_pwr_mode dev_state,
 
 static struct ufs_dev_fix ufs_fixups[] = {
        /* UFS cards deviations table */
-       UFS_FIX(UFS_VENDOR_MICRON, UFS_ANY_MODEL,
-               UFS_DEVICE_QUIRK_DELAY_BEFORE_LPM |
-               UFS_DEVICE_QUIRK_SWAP_L2P_ENTRY_FOR_HPB_READ),
-       UFS_FIX(UFS_VENDOR_SAMSUNG, UFS_ANY_MODEL,
-               UFS_DEVICE_QUIRK_DELAY_BEFORE_LPM |
-               UFS_DEVICE_QUIRK_HOST_PA_TACTIVATE |
-               UFS_DEVICE_QUIRK_RECOVERY_FROM_DL_NAC_ERRORS),
-       UFS_FIX(UFS_VENDOR_SKHYNIX, UFS_ANY_MODEL,
-               UFS_DEVICE_QUIRK_HOST_PA_SAVECONFIGTIME),
-       UFS_FIX(UFS_VENDOR_SKHYNIX, "hB8aL1" /*H28U62301AMR*/,
-               UFS_DEVICE_QUIRK_HOST_VS_DEBUGSAVECONFIGTIME),
-       UFS_FIX(UFS_VENDOR_TOSHIBA, UFS_ANY_MODEL,
-               UFS_DEVICE_QUIRK_DELAY_BEFORE_LPM),
-       UFS_FIX(UFS_VENDOR_TOSHIBA, "THGLF2G9C8KBADG",
-               UFS_DEVICE_QUIRK_PA_TACTIVATE),
-       UFS_FIX(UFS_VENDOR_TOSHIBA, "THGLF2G9D8KBADG",
-               UFS_DEVICE_QUIRK_PA_TACTIVATE),
-       END_FIX
+       { .wmanufacturerid = UFS_VENDOR_MICRON,
+         .model = UFS_ANY_MODEL,
+         .quirk = UFS_DEVICE_QUIRK_DELAY_BEFORE_LPM |
+                  UFS_DEVICE_QUIRK_SWAP_L2P_ENTRY_FOR_HPB_READ },
+       { .wmanufacturerid = UFS_VENDOR_SAMSUNG,
+         .model = UFS_ANY_MODEL,
+         .quirk = UFS_DEVICE_QUIRK_DELAY_BEFORE_LPM |
+                  UFS_DEVICE_QUIRK_HOST_PA_TACTIVATE |
+                  UFS_DEVICE_QUIRK_RECOVERY_FROM_DL_NAC_ERRORS },
+       { .wmanufacturerid = UFS_VENDOR_SKHYNIX,
+         .model = UFS_ANY_MODEL,
+         .quirk = UFS_DEVICE_QUIRK_HOST_PA_SAVECONFIGTIME },
+       { .wmanufacturerid = UFS_VENDOR_SKHYNIX,
+         .model = "hB8aL1" /*H28U62301AMR*/,
+         .quirk = UFS_DEVICE_QUIRK_HOST_VS_DEBUGSAVECONFIGTIME },
+       { .wmanufacturerid = UFS_VENDOR_TOSHIBA,
+         .model = UFS_ANY_MODEL,
+         .quirk = UFS_DEVICE_QUIRK_DELAY_BEFORE_LPM },
+       { .wmanufacturerid = UFS_VENDOR_TOSHIBA,
+         .model = "THGLF2G9C8KBADG",
+         .quirk = UFS_DEVICE_QUIRK_PA_TACTIVATE },
+       { .wmanufacturerid = UFS_VENDOR_TOSHIBA,
+         .model = "THGLF2G9D8KBADG",
+         .quirk = UFS_DEVICE_QUIRK_PA_TACTIVATE },
+       {}
 };
 
 static irqreturn_t ufshcd_tmc_handler(struct ufs_hba *hba);