Hi Stanley > -----Original Message----- > From: Stanley Chu <stanley.chu@xxxxxxxxxxxx> > Sent: 10 June 2020 11:07 > To: linux-scsi@xxxxxxxxxxxxxxx; martin.petersen@xxxxxxxxxx; > avri.altman@xxxxxxx; alim.akhtar@xxxxxxxxxxx; jejb@xxxxxxxxxxxxx; > asutoshd@xxxxxxxxxxxxxx > Cc: beanhuo@xxxxxxxxxx; cang@xxxxxxxxxxxxxx; matthias.bgg@xxxxxxxxx; > bvanassche@xxxxxxx; linux-mediatek@xxxxxxxxxxxxxxxxxxx; linux-arm- > kernel@xxxxxxxxxxxxxxxxxxx; linux-kernel@xxxxxxxxxxxxxxx; > kuohong.wang@xxxxxxxxxxxx; peter.wang@xxxxxxxxxxxx; chun- > hung.wu@xxxxxxxxxxxx; andy.teng@xxxxxxxxxxxx; > chaotian.jing@xxxxxxxxxxxx; cc.chou@xxxxxxxxxxxx; Stanley Chu > <stanley.chu@xxxxxxxxxxxx> > Subject: [PATCH v1 2/2] scsi: ufs: Cleanup device vendor and quirk definition > > Cleanup below items, > - Arrange vendor name in alphabetical order > - Squash device quirks as compact as possible in device quirk table > to enhance performance of the lookup. > > Signed-off-by: Stanley Chu <stanley.chu@xxxxxxxxxxxx> > --- > drivers/scsi/ufs/ufs_quirks.h | 2 +- > drivers/scsi/ufs/ufshcd.c | 6 ++---- > 2 files changed, 3 insertions(+), 5 deletions(-) > > diff --git a/drivers/scsi/ufs/ufs_quirks.h b/drivers/scsi/ufs/ufs_quirks.h index > e80d5f26a442..2a0041493e30 100644 > --- a/drivers/scsi/ufs/ufs_quirks.h > +++ b/drivers/scsi/ufs/ufs_quirks.h > @@ -13,9 +13,9 @@ > #define UFS_ANY_MODEL "ANY_MODEL" > > #define UFS_VENDOR_MICRON 0x12C > -#define UFS_VENDOR_TOSHIBA 0x198 > #define UFS_VENDOR_SAMSUNG 0x1CE > #define UFS_VENDOR_SKHYNIX 0x1AD > +#define UFS_VENDOR_TOSHIBA 0x198 > #define UFS_VENDOR_WDC 0x145 > > /** > diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index > dea4fddf9332..7c93cb446f51 100644 > --- a/drivers/scsi/ufs/ufshcd.c > +++ b/drivers/scsi/ufs/ufshcd.c > @@ -219,10 +219,8 @@ static struct ufs_dev_fix ufs_fixups[] = { > UFS_FIX(UFS_VENDOR_MICRON, UFS_ANY_MODEL, > UFS_DEVICE_QUIRK_DELAY_BEFORE_LPM), > UFS_FIX(UFS_VENDOR_SAMSUNG, UFS_ANY_MODEL, > - UFS_DEVICE_QUIRK_DELAY_BEFORE_LPM), > - UFS_FIX(UFS_VENDOR_SAMSUNG, UFS_ANY_MODEL, > - UFS_DEVICE_QUIRK_RECOVERY_FROM_DL_NAC_ERRORS), > - UFS_FIX(UFS_VENDOR_SAMSUNG, UFS_ANY_MODEL, > + UFS_DEVICE_QUIRK_DELAY_BEFORE_LPM | > + UFS_DEVICE_QUIRK_RECOVERY_FROM_DL_NAC_ERRORS | > UFS_DEVICE_QUIRK_HOST_PA_TACTIVATE), > UFS_FIX(UFS_VENDOR_TOSHIBA, UFS_ANY_MODEL, > UFS_DEVICE_QUIRK_DELAY_BEFORE_LPM), > -- While at this, may be arrange the table in alphabetical order. > 2.18.0