| Message ID | 20241120-topic-ufs-cleanup-v1-3-a5cef54b1cdc@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | ufs: core: initial cleanup and defines sync with Linux v6.12 | expand |
On 20/11/24 14:52, Neil Armstrong wrote: > Fixes some alignment warnings, missing comments on write barrier, > missing parenthesis around macro parameters and a comment typo. > > No functional changes intended. > > Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> > --- > drivers/ufs/ufs.c | 16 ++++++---------- > drivers/ufs/ufs.h | 6 +++--- > drivers/ufs/unipro.h | 4 ++-- > 3 files changed, 11 insertions(+), 15 deletions(-) > > diff --git a/drivers/ufs/ufs.c b/drivers/ufs/ufs.c > index 8a6c9f1e40b058dfd29bc07d011d576cdfc504cb..173b8d01d2a415999248468890cc9bcb66a21c24 100644 > --- a/drivers/ufs/ufs.c > +++ b/drivers/ufs/ufs.c > @@ -314,16 +314,12 @@ static int ufshcd_disable_tx_lcc(struct ufs_hba *hba, bool peer) > ufshcd_dme_peer_get(hba, UIC_ARG_MIB(PA_CONNECTEDTXDATALANES), > &tx_lanes); > for (i = 0; i < tx_lanes; i++) { > + unsigned int val = UIC_ARG_MIB_SEL(TX_LCC_ENABLE, > + UIC_ARG_MPHY_TX_GEN_SEL_INDEX(i)); > if (!peer) > - err = ufshcd_dme_set(hba, > - UIC_ARG_MIB_SEL(TX_LCC_ENABLE, > - UIC_ARG_MPHY_TX_GEN_SEL_INDEX(i)), > - 0); > + err = ufshcd_dme_set(hba, val, 0); > else > - err = ufshcd_dme_peer_set(hba, > - UIC_ARG_MIB_SEL(TX_LCC_ENABLE, > - UIC_ARG_MPHY_TX_GEN_SEL_INDEX(i)), > - 0); > + err = ufshcd_dme_peer_set(hba, val, 0); > if (err) { > dev_err(hba->dev, "%s: TX LCC Disable failed, peer = %d, lane = %d, err = %d\n", > __func__, peer, i, err); > @@ -1963,7 +1959,7 @@ int ufshcd_probe(struct udevice *ufs_dev, struct ufs_hba_ops *hba_ops) > > ufshcd_ops_init(hba); > > - /* Read capabilties registers */ > + /* Read capabilities registers */ > hba->capabilities = ufshcd_readl(hba, REG_CONTROLLER_CAPABILITIES); > if (hba->quirks & UFSHCD_QUIRK_BROKEN_64BIT_ADDRESS) > hba->capabilities &= ~MASK_64_ADDRESSING_SUPPORT; > @@ -2002,7 +1998,7 @@ int ufshcd_probe(struct udevice *ufs_dev, struct ufs_hba_ops *hba_ops) > REG_INTERRUPT_STATUS); > ufshcd_writel(hba, 0, REG_INTERRUPT_ENABLE); > > - mb(); > + mb(); /* flush previous writes */ > > /* Reset the attached device */ > ufshcd_device_reset(hba); > diff --git a/drivers/ufs/ufs.h b/drivers/ufs/ufs.h > index 00ecca350c350cc930d9056aba8ada0475a280dd..f4f042005e7fc2638ea6b33f26839c668d22bc9e 100644 > --- a/drivers/ufs/ufs.h > +++ b/drivers/ufs/ufs.h > @@ -130,8 +130,8 @@ enum { > (sizeof(struct utp_upiu_header))) > #define RESPONSE_UPIU_SENSE_DATA_LENGTH 18 > #define UPIU_HEADER_DWORD(byte3, byte2, byte1, byte0)\ > - cpu_to_be32((byte3 << 24) | (byte2 << 16) |\ > - (byte1 << 8) | (byte0)) > + cpu_to_be32(((byte3) << 24) | ((byte2) << 16) |\ > + ((byte1) << 8) | (byte0)) > /* > * UFS Protocol Information Unit related definitions > */ > @@ -915,7 +915,7 @@ static inline int ufshcd_ops_get_max_pwr_mode(struct ufs_hba *hba, > } > > static inline int ufshcd_ops_hce_enable_notify(struct ufs_hba *hba, > - bool status) > + bool status) > { > if (hba->ops && hba->ops->hce_enable_notify) > return hba->ops->hce_enable_notify(hba, status); > diff --git a/drivers/ufs/unipro.h b/drivers/ufs/unipro.h > index 6df953e6e6073748ac640faea00aa6ac2a8c8663..0aa35ef31dfd263739c0b5c75c26f9191f38e8ec 100644 > --- a/drivers/ufs/unipro.h > +++ b/drivers/ufs/unipro.h > @@ -59,7 +59,7 @@ > #define RXSQCTRL 0x00B5 > #define CFGRXOVR6 0x00BF > > -#define is_mphy_tx_attr(attr) (attr < RX_MODE) > +#define is_mphy_tx_attr(attr) ((attr) < RX_MODE) > #define RX_MIN_ACTIVATETIME_UNIT_US 100 > #define HIBERN8TIME_UNIT_US 100 > > @@ -77,7 +77,7 @@ > #define CBPRGPLL2 UNIPRO_CB_OFFSET(0x00F8) > #define CBPRGTUNING UNIPRO_CB_OFFSET(0x00FB) > > -#define UNIPRO_CB_OFFSET(x) (0x8000 | x) > +#define UNIPRO_CB_OFFSET(x) (0x8000 | (x)) > > /* > * PHY Adpater attributes > Reviewed-by: Neha Malcom Francis <n-francis@ti.com>
diff --git a/drivers/ufs/ufs.c b/drivers/ufs/ufs.c index 8a6c9f1e40b058dfd29bc07d011d576cdfc504cb..173b8d01d2a415999248468890cc9bcb66a21c24 100644 --- a/drivers/ufs/ufs.c +++ b/drivers/ufs/ufs.c @@ -314,16 +314,12 @@ static int ufshcd_disable_tx_lcc(struct ufs_hba *hba, bool peer) ufshcd_dme_peer_get(hba, UIC_ARG_MIB(PA_CONNECTEDTXDATALANES), &tx_lanes); for (i = 0; i < tx_lanes; i++) { + unsigned int val = UIC_ARG_MIB_SEL(TX_LCC_ENABLE, + UIC_ARG_MPHY_TX_GEN_SEL_INDEX(i)); if (!peer) - err = ufshcd_dme_set(hba, - UIC_ARG_MIB_SEL(TX_LCC_ENABLE, - UIC_ARG_MPHY_TX_GEN_SEL_INDEX(i)), - 0); + err = ufshcd_dme_set(hba, val, 0); else - err = ufshcd_dme_peer_set(hba, - UIC_ARG_MIB_SEL(TX_LCC_ENABLE, - UIC_ARG_MPHY_TX_GEN_SEL_INDEX(i)), - 0); + err = ufshcd_dme_peer_set(hba, val, 0); if (err) { dev_err(hba->dev, "%s: TX LCC Disable failed, peer = %d, lane = %d, err = %d\n", __func__, peer, i, err); @@ -1963,7 +1959,7 @@ int ufshcd_probe(struct udevice *ufs_dev, struct ufs_hba_ops *hba_ops) ufshcd_ops_init(hba); - /* Read capabilties registers */ + /* Read capabilities registers */ hba->capabilities = ufshcd_readl(hba, REG_CONTROLLER_CAPABILITIES); if (hba->quirks & UFSHCD_QUIRK_BROKEN_64BIT_ADDRESS) hba->capabilities &= ~MASK_64_ADDRESSING_SUPPORT; @@ -2002,7 +1998,7 @@ int ufshcd_probe(struct udevice *ufs_dev, struct ufs_hba_ops *hba_ops) REG_INTERRUPT_STATUS); ufshcd_writel(hba, 0, REG_INTERRUPT_ENABLE); - mb(); + mb(); /* flush previous writes */ /* Reset the attached device */ ufshcd_device_reset(hba); diff --git a/drivers/ufs/ufs.h b/drivers/ufs/ufs.h index 00ecca350c350cc930d9056aba8ada0475a280dd..f4f042005e7fc2638ea6b33f26839c668d22bc9e 100644 --- a/drivers/ufs/ufs.h +++ b/drivers/ufs/ufs.h @@ -130,8 +130,8 @@ enum { (sizeof(struct utp_upiu_header))) #define RESPONSE_UPIU_SENSE_DATA_LENGTH 18 #define UPIU_HEADER_DWORD(byte3, byte2, byte1, byte0)\ - cpu_to_be32((byte3 << 24) | (byte2 << 16) |\ - (byte1 << 8) | (byte0)) + cpu_to_be32(((byte3) << 24) | ((byte2) << 16) |\ + ((byte1) << 8) | (byte0)) /* * UFS Protocol Information Unit related definitions */ @@ -915,7 +915,7 @@ static inline int ufshcd_ops_get_max_pwr_mode(struct ufs_hba *hba, } static inline int ufshcd_ops_hce_enable_notify(struct ufs_hba *hba, - bool status) + bool status) { if (hba->ops && hba->ops->hce_enable_notify) return hba->ops->hce_enable_notify(hba, status); diff --git a/drivers/ufs/unipro.h b/drivers/ufs/unipro.h index 6df953e6e6073748ac640faea00aa6ac2a8c8663..0aa35ef31dfd263739c0b5c75c26f9191f38e8ec 100644 --- a/drivers/ufs/unipro.h +++ b/drivers/ufs/unipro.h @@ -59,7 +59,7 @@ #define RXSQCTRL 0x00B5 #define CFGRXOVR6 0x00BF -#define is_mphy_tx_attr(attr) (attr < RX_MODE) +#define is_mphy_tx_attr(attr) ((attr) < RX_MODE) #define RX_MIN_ACTIVATETIME_UNIT_US 100 #define HIBERN8TIME_UNIT_US 100 @@ -77,7 +77,7 @@ #define CBPRGPLL2 UNIPRO_CB_OFFSET(0x00F8) #define CBPRGTUNING UNIPRO_CB_OFFSET(0x00FB) -#define UNIPRO_CB_OFFSET(x) (0x8000 | x) +#define UNIPRO_CB_OFFSET(x) (0x8000 | (x)) /* * PHY Adpater attributes
Fixes some alignment warnings, missing comments on write barrier, missing parenthesis around macro parameters and a comment typo. No functional changes intended. Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> --- drivers/ufs/ufs.c | 16 ++++++---------- drivers/ufs/ufs.h | 6 +++--- drivers/ufs/unipro.h | 4 ++-- 3 files changed, 11 insertions(+), 15 deletions(-)