From patchwork Thu Oct 15 20:16:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Marek X-Patchwork-Id: 7409691 Return-Path: X-Original-To: patchwork-linux-scsi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 791639F1D5 for ; Thu, 15 Oct 2015 20:20:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A0460206BA for ; Thu, 15 Oct 2015 20:20:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AC95B20696 for ; Thu, 15 Oct 2015 20:20:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753208AbbJOUR5 (ORCPT ); Thu, 15 Oct 2015 16:17:57 -0400 Received: from mx2.suse.de ([195.135.220.15]:54994 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753043AbbJOURZ (ORCPT ); Thu, 15 Oct 2015 16:17:25 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id B018AABDC; Thu, 15 Oct 2015 20:17:22 +0000 (UTC) Received: by sepie.suse.cz (Postfix, from userid 10020) id AA8A44058F; Thu, 15 Oct 2015 22:17:23 +0200 (CEST) From: Michal Marek 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 Date: Thu, 15 Oct 2015 22:16:29 +0200 Message-Id: <1444940195-28272-4-git-send-email-mmarek@suse.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1444940195-28272-1-git-send-email-mmarek@suse.com> References: <1444940195-28272-1-git-send-email-mmarek@suse.com> Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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 */ \ }