diff options
| author | Nicolas Dichtel <nicolas.dichtel@6wind.com> | 2016-03-04 05:52:17 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-03-04 16:10:36 -0500 |
| commit | 28466e0f2463a1084781c9312cd9148b2530eea7 (patch) | |
| tree | d5a135b537b3e6a40785a13c4a06c64abe3cf27d /drivers/scsi/cxgbi/cxgb4i | |
| parent | b5d3755a22e0cc4c369c0985aef0c52c2477c1e7 (diff) | |
cxgb4i: don't redefine DIV_ROUND_UP
let's use the common definition to avoid the following warning during the
compilation:
drivers/scsi/cxgbi/cxgb4i/cxgb4i.c:161:0: warning: "DIV_ROUND_UP" redefined
#define DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d))
^
In file included from include/linux/list.h:8:0,
from include/linux/module.h:9,
from drivers/scsi/cxgbi/cxgb4i/cxgb4i.c:16:
include/linux/kernel.h:67:0: note: this is the location of the previous definition
#define DIV_ROUND_UP __KERNEL_DIV_ROUND_UP
^
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/scsi/cxgbi/cxgb4i')
| -rw-r--r-- | drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c b/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c index 804806e1cbb4..339f6b7f4803 100644 --- a/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c +++ b/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | 13 | ||
| 14 | #define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__ | 14 | #define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__ |
| 15 | 15 | ||
| 16 | #include <linux/kernel.h> | ||
| 16 | #include <linux/module.h> | 17 | #include <linux/module.h> |
| 17 | #include <linux/moduleparam.h> | 18 | #include <linux/moduleparam.h> |
| 18 | #include <scsi/scsi_host.h> | 19 | #include <scsi/scsi_host.h> |
| @@ -158,7 +159,6 @@ static struct scsi_transport_template *cxgb4i_stt; | |||
| 158 | * open/close/abort and data send/receive. | 159 | * open/close/abort and data send/receive. |
| 159 | */ | 160 | */ |
| 160 | 161 | ||
| 161 | #define DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d)) | ||
| 162 | #define RCV_BUFSIZ_MASK 0x3FFU | 162 | #define RCV_BUFSIZ_MASK 0x3FFU |
| 163 | #define MAX_IMM_TX_PKT_LEN 256 | 163 | #define MAX_IMM_TX_PKT_LEN 256 |
| 164 | 164 | ||