Commit e594a178 authored by Michal Marek's avatar Michal Marek

aic7xxx: Avoid name collision with <linux/list.h>

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"
Signed-off-by: default avatarMichal Marek <mmarek@suse.com>
parent d2fb5aed
...@@ -624,7 +624,7 @@ struct scb { ...@@ -624,7 +624,7 @@ struct scb {
}; };
TAILQ_HEAD(scb_tailq, scb); TAILQ_HEAD(scb_tailq, scb);
LIST_HEAD(scb_list, scb); BSD_LIST_HEAD(scb_list, scb);
struct scb_data { struct scb_data {
/* /*
...@@ -1069,7 +1069,7 @@ struct ahd_softc { ...@@ -1069,7 +1069,7 @@ struct ahd_softc {
/* /*
* SCBs that have been sent to the controller * SCBs that have been sent to the controller
*/ */
LIST_HEAD(, scb) pending_scbs; BSD_LIST_HEAD(, scb) pending_scbs;
/* /*
* Current register window mode information. * Current register window mode information.
......
...@@ -65,11 +65,6 @@ ...@@ -65,11 +65,6 @@
/* Core SCSI definitions */ /* Core SCSI definitions */
#define AIC_LIB_PREFIX ahd #define AIC_LIB_PREFIX ahd
/* Name space conflict with BSD queue macros */
#ifdef LIST_HEAD
#undef LIST_HEAD
#endif
#include "cam.h" #include "cam.h"
#include "queue.h" #include "queue.h"
#include "scsi_message.h" #include "scsi_message.h"
......
...@@ -916,7 +916,7 @@ struct ahc_softc { ...@@ -916,7 +916,7 @@ struct ahc_softc {
/* /*
* SCBs that have been sent to the controller * 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 * Counting lock for deferring the release of additional
......
...@@ -82,11 +82,6 @@ ...@@ -82,11 +82,6 @@
/* Core SCSI definitions */ /* Core SCSI definitions */
#define AIC_LIB_PREFIX ahc #define AIC_LIB_PREFIX ahc
/* Name space conflict with BSD queue macros */
#ifdef LIST_HEAD
#undef LIST_HEAD
#endif
#include "cam.h" #include "cam.h"
#include "queue.h" #include "queue.h"
#include "scsi_message.h" #include "scsi_message.h"
......
...@@ -246,7 +246,7 @@ struct { \ ...@@ -246,7 +246,7 @@ struct { \
/* /*
* List declarations. * List declarations.
*/ */
#define LIST_HEAD(name, type) \ #define BSD_LIST_HEAD(name, type) \
struct name { \ struct name { \
struct type *lh_first; /* first element */ \ struct type *lh_first; /* first element */ \
} }
......
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