From: Nicolas Dichtel <nicolas.dichtel@6wind.com>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, ben@decadent.org.uk,
Karen Xie <kxie@chelsio.com>,
linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org,
David Airlie <airlied@linux.ie>,
dri-devel@lists.freedesktop.org,
Nicolas Dichtel <nicolas.dichtel@6wind.com>
Subject: [PATCH net-next v3 2/4] cxgb4i: don't redefine DIV_ROUND_UP
Date: Fri, 4 Mar 2016 11:52:17 +0100 [thread overview]
Message-ID: <1457088739-1065-3-git-send-email-nicolas.dichtel@6wind.com> (raw)
In-Reply-To: <1457088739-1065-1-git-send-email-nicolas.dichtel@6wind.com>
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>
---
drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 @@
#define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__
+#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <scsi/scsi_host.h>
@@ -158,7 +159,6 @@ static struct scsi_transport_template *cxgb4i_stt;
* open/close/abort and data send/receive.
*/
-#define DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d))
#define RCV_BUFSIZ_MASK 0x3FFU
#define MAX_IMM_TX_PKT_LEN 256
--
2.4.2
next prev parent reply other threads:[~2016-03-04 10:52 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20160303.170804.2300821465150459193.davem@davemloft.net>
2016-03-04 10:52 ` [PATCH net-next v3 0/4] uapi: consolidate DIV_ROUND_UP definition Nicolas Dichtel
2016-03-04 10:52 ` [PATCH net-next v3 1/4] uapi: define DIV_ROUND_UP for userland Nicolas Dichtel
2016-03-04 10:52 ` Nicolas Dichtel [this message]
2016-03-04 10:52 ` [PATCH net-next v3 3/4] drm/vmwgfx: remove userland definition of DIV_ROUND_UP Nicolas Dichtel
2016-03-04 21:36 ` Emil Velikov
2016-03-04 10:52 ` [PATCH net-next v3 4/4] ethtool.h: define INT_MAX for userland Nicolas Dichtel
2016-03-04 13:10 ` Nikolay Aleksandrov
2016-03-04 21:10 ` [PATCH net-next v3 0/4] uapi: consolidate DIV_ROUND_UP definition David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1457088739-1065-3-git-send-email-nicolas.dichtel@6wind.com \
--to=nicolas.dichtel@6wind.com \
--cc=airlied@linux.ie \
--cc=ben@decadent.org.uk \
--cc=davem@davemloft.net \
--cc=dri-devel@lists.freedesktop.org \
--cc=kxie@chelsio.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox