From: Michal Marek <mmarek@suse.com>
To: linux-kbuild@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, linux-scsi@vger.kernel.org
Subject: [PATCH 3/9] aic7xxx: Avoid name collision with <linux/list.h>
Date: Thu, 15 Oct 2015 22:16:29 +0200 [thread overview]
Message-ID: <1444940195-28272-4-git-send-email-mmarek@suse.com> (raw)
In-Reply-To: <1444940195-28272-1-git-send-email-mmarek@suse.com>
Rename the local definition of LIST_HEAD to BSD_LIST_HEAD. This fixes a
ctags error if we apply the C rules to header files as well:
ctags: Warning: drivers/scsi/aic7xxx/aic79xx.h:1072: null expansion of name pattern "\3"
ctags: Warning: drivers/scsi/aic7xxx/aic7xxx.h:919: null expansion of name pattern "\3"
Cc: linux-scsi@vger.kernel.org
Signed-off-by: Michal Marek <mmarek@suse.com>
---
drivers/scsi/aic7xxx/aic79xx.h | 4 ++--
drivers/scsi/aic7xxx/aic79xx_osm.h | 5 -----
drivers/scsi/aic7xxx/aic7xxx.h | 2 +-
drivers/scsi/aic7xxx/aic7xxx_osm.h | 5 -----
drivers/scsi/aic7xxx/queue.h | 2 +-
5 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/drivers/scsi/aic7xxx/aic79xx.h b/drivers/scsi/aic7xxx/aic79xx.h
index df2e0e5367d2..d47b527b25dd 100644
--- a/drivers/scsi/aic7xxx/aic79xx.h
+++ b/drivers/scsi/aic7xxx/aic79xx.h
@@ -624,7 +624,7 @@ struct scb {
};
TAILQ_HEAD(scb_tailq, scb);
-LIST_HEAD(scb_list, scb);
+BSD_LIST_HEAD(scb_list, scb);
struct scb_data {
/*
@@ -1069,7 +1069,7 @@ struct ahd_softc {
/*
* SCBs that have been sent to the controller
*/
- LIST_HEAD(, scb) pending_scbs;
+ BSD_LIST_HEAD(, scb) pending_scbs;
/*
* Current register window mode information.
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.h b/drivers/scsi/aic7xxx/aic79xx_osm.h
index c58fa33c6592..728193a42e6e 100644
--- a/drivers/scsi/aic7xxx/aic79xx_osm.h
+++ b/drivers/scsi/aic7xxx/aic79xx_osm.h
@@ -65,11 +65,6 @@
/* Core SCSI definitions */
#define AIC_LIB_PREFIX ahd
-/* Name space conflict with BSD queue macros */
-#ifdef LIST_HEAD
-#undef LIST_HEAD
-#endif
-
#include "cam.h"
#include "queue.h"
#include "scsi_message.h"
diff --git a/drivers/scsi/aic7xxx/aic7xxx.h b/drivers/scsi/aic7xxx/aic7xxx.h
index f695774645c1..4ce4e903a759 100644
--- a/drivers/scsi/aic7xxx/aic7xxx.h
+++ b/drivers/scsi/aic7xxx/aic7xxx.h
@@ -916,7 +916,7 @@ struct ahc_softc {
/*
* SCBs that have been sent to the controller
*/
- LIST_HEAD(, scb) pending_scbs;
+ BSD_LIST_HEAD(, scb) pending_scbs;
/*
* Counting lock for deferring the release of additional
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.h b/drivers/scsi/aic7xxx/aic7xxx_osm.h
index bc4cca92ff04..54c702864103 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_osm.h
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm.h
@@ -82,11 +82,6 @@
/* Core SCSI definitions */
#define AIC_LIB_PREFIX ahc
-/* Name space conflict with BSD queue macros */
-#ifdef LIST_HEAD
-#undef LIST_HEAD
-#endif
-
#include "cam.h"
#include "queue.h"
#include "scsi_message.h"
diff --git a/drivers/scsi/aic7xxx/queue.h b/drivers/scsi/aic7xxx/queue.h
index 8adf8003a164..ba602981f193 100644
--- a/drivers/scsi/aic7xxx/queue.h
+++ b/drivers/scsi/aic7xxx/queue.h
@@ -246,7 +246,7 @@ struct { \
/*
* List declarations.
*/
-#define LIST_HEAD(name, type) \
+#define BSD_LIST_HEAD(name, type) \
struct name { \
struct type *lh_first; /* first element */ \
}
--
2.1.4
next prev parent reply other threads:[~2015-10-15 20:18 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-15 20:16 [PATCH 0/9] scripts/tags.sh cleanup Michal Marek
2015-10-15 20:16 ` [PATCH 1/9] tags: Treat header files as C code Michal Marek
2015-10-15 20:16 ` [PATCH 2/9] KVM: arm: Do not indent the arguments of DECLARE_BITMAP Michal Marek
2015-10-18 20:34 ` Christoffer Dall
2015-10-19 11:55 ` Michal Marek
2015-10-19 12:05 ` Christoffer Dall
2015-10-19 12:07 ` Michal Marek
2015-10-15 20:16 ` Michal Marek [this message]
2015-10-15 20:16 ` [PATCH 4/9] tags: Fix erroneous pattern match in a comment Michal Marek
2015-10-15 20:16 ` [PATCH 5/9] tags: Process Kconfig files in a single pass Michal Marek
2015-10-15 20:16 ` [PATCH 6/9] tags: Do not try to index defconfigs Michal Marek
2015-10-15 20:16 ` [PATCH 7/9] tags: Drop the _PE rule Michal Marek
2015-10-15 20:16 ` [PATCH 8/9] tags: Unify emacs and exuberant rules Michal Marek
2015-10-15 20:16 ` [PATCH 9/9] treewide: Remove newlines inside DEFINE_PER_CPU() macros Michal Marek
2015-10-21 19:27 ` Prarit Bhargava
2015-10-21 19:52 ` Michal Marek
2015-10-22 11:31 ` Prarit Bhargava
2015-10-22 12:06 ` Michal Marek
2015-10-22 12:14 ` Prarit Bhargava
2015-10-22 12:24 ` Michal Marek
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=1444940195-28272-4-git-send-email-mmarek@suse.com \
--to=mmarek@suse.com \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@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
all inboxes | Powered by JetHome®