| Message ID | 20170602113225.24816-1-clabbe.montjoie@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Fri, 2017-06-02 at 13:32 +0200, Corentin Labbe wrote: > Instead of rewriting write/readq, use linux/io-64-nonatomic-lo-hi.h which > already have them. Reviewed-by: Bart Van Assche <Bart.VanAssche@sandisk.com>
> On Jun 2, 2017, at 4:32 AM, Corentin Labbe <clabbe.montjoie@gmail.com> wrote: > > Instead of rewriting write/readq, use linux/io-64-nonatomic-lo-hi.h which > already have them. > > Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com> > --- > drivers/scsi/qla2xxx/qla_nx.h | 17 ++--------------- > 1 file changed, 2 insertions(+), 15 deletions(-) > > diff --git a/drivers/scsi/qla2xxx/qla_nx.h b/drivers/scsi/qla2xxx/qla_nx.h > index 77624eac95a4..71a41093530e 100644 > --- a/drivers/scsi/qla2xxx/qla_nx.h > +++ b/drivers/scsi/qla2xxx/qla_nx.h > @@ -7,6 +7,8 @@ > #ifndef __QLA_NX_H > #define __QLA_NX_H > > +#include <linux/io-64-nonatomic-lo-hi.h> > + > /* > * Following are the states of the Phantom. Phantom will set them and > * Host will read to check if the fields are correct. > @@ -819,21 +821,6 @@ struct qla82xx_uri_data_desc{ > #define MIU_TEST_AGT_WRDATA_UPPER_LO (0x0b0) > #define MIU_TEST_AGT_WRDATA_UPPER_HI (0x0b4) > > -#ifndef readq > -static inline u64 readq(void __iomem *addr) > -{ > - return readl(addr) | (((u64) readl(addr + 4)) << 32LL); > -} > -#endif > - > -#ifndef writeq > -static inline void writeq(u64 val, void __iomem *addr) > -{ > - writel(((u32) (val)), (addr)); > - writel(((u32) (val >> 32)), (addr + 4)); > -} > -#endif > - > /* Request and response queue size */ > #define REQUEST_ENTRY_CNT_82XX 128 /* Number of request entries. */ > #define RESPONSE_ENTRY_CNT_82XX 128 /* Number of response entries.*/ > -- > 2.13.0 > Looks Good. Thanks Acked-by: Himanshu Madhani <himanshu.madhani@cavium.com> - Himanshu
Corentin, > Instead of rewriting write/readq, use linux/io-64-nonatomic-lo-hi.h > which already have them. Applied to 4.13/scsi-queue, thank you!
diff --git a/drivers/scsi/qla2xxx/qla_nx.h b/drivers/scsi/qla2xxx/qla_nx.h index 77624eac95a4..71a41093530e 100644 --- a/drivers/scsi/qla2xxx/qla_nx.h +++ b/drivers/scsi/qla2xxx/qla_nx.h @@ -7,6 +7,8 @@ #ifndef __QLA_NX_H #define __QLA_NX_H +#include <linux/io-64-nonatomic-lo-hi.h> + /* * Following are the states of the Phantom. Phantom will set them and * Host will read to check if the fields are correct. @@ -819,21 +821,6 @@ struct qla82xx_uri_data_desc{ #define MIU_TEST_AGT_WRDATA_UPPER_LO (0x0b0) #define MIU_TEST_AGT_WRDATA_UPPER_HI (0x0b4) -#ifndef readq -static inline u64 readq(void __iomem *addr) -{ - return readl(addr) | (((u64) readl(addr + 4)) << 32LL); -} -#endif - -#ifndef writeq -static inline void writeq(u64 val, void __iomem *addr) -{ - writel(((u32) (val)), (addr)); - writel(((u32) (val >> 32)), (addr + 4)); -} -#endif - /* Request and response queue size */ #define REQUEST_ENTRY_CNT_82XX 128 /* Number of request entries. */ #define RESPONSE_ENTRY_CNT_82XX 128 /* Number of response entries.*/
Instead of rewriting write/readq, use linux/io-64-nonatomic-lo-hi.h which already have them. Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com> --- drivers/scsi/qla2xxx/qla_nx.h | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-)