Commit 52eacd61 authored by Corentin Labbe's avatar Corentin Labbe Committed by Martin K. Petersen

scsi: qla2xxx: remove writeq/readq function definitions

Instead of rewriting write/readq, use linux/io-64-nonatomic-lo-hi.h
which already have them.
Signed-off-by: default avatarCorentin Labbe <clabbe.montjoie@gmail.com>
Reviewed-by: default avatarBart Van Assche <Bart.VanAssche@sandisk.com>
Acked-by: default avatarHimanshu Madhani <himanshu.madhani@cavium.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 16a61115
...@@ -7,6 +7,8 @@ ...@@ -7,6 +7,8 @@
#ifndef __QLA_NX_H #ifndef __QLA_NX_H
#define __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 * Following are the states of the Phantom. Phantom will set them and
* Host will read to check if the fields are correct. * Host will read to check if the fields are correct.
...@@ -819,21 +821,6 @@ struct qla82xx_uri_data_desc{ ...@@ -819,21 +821,6 @@ struct qla82xx_uri_data_desc{
#define MIU_TEST_AGT_WRDATA_UPPER_LO (0x0b0) #define MIU_TEST_AGT_WRDATA_UPPER_LO (0x0b0)
#define MIU_TEST_AGT_WRDATA_UPPER_HI (0x0b4) #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 */ /* Request and response queue size */
#define REQUEST_ENTRY_CNT_82XX 128 /* Number of request entries. */ #define REQUEST_ENTRY_CNT_82XX 128 /* Number of request entries. */
#define RESPONSE_ENTRY_CNT_82XX 128 /* Number of response entries.*/ #define RESPONSE_ENTRY_CNT_82XX 128 /* Number of response entries.*/
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment