From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A33C2C0044C for ; Wed, 31 Oct 2018 15:23:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6AC6320664 for ; Wed, 31 Oct 2018 15:23:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=nifty.com header.i=@nifty.com header.b="bK+U340s" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6AC6320664 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=socionext.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-pci-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727620AbeKAAVg (ORCPT ); Wed, 31 Oct 2018 20:21:36 -0400 Received: from conssluserg-01.nifty.com ([210.131.2.80]:57197 "EHLO conssluserg-01.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726476AbeKAAVg (ORCPT ); Wed, 31 Oct 2018 20:21:36 -0400 Received: from mail-vs1-f44.google.com (mail-vs1-f44.google.com [209.85.217.44]) (authenticated) by conssluserg-01.nifty.com with ESMTP id w9VFMwbB023518; Thu, 1 Nov 2018 00:22:59 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conssluserg-01.nifty.com w9VFMwbB023518 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1540999379; bh=/V70+fgEgC0ZBcK91HaOzpn4PVyRyLyCy+HFjvOlauw=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=bK+U340sU5gL7okxCsvL2b10TzAiWCeWEl7PaRQFJtRNvL/G9jEHYm1uoiKOmwCyb 8fmsO5aLrFtzUKGauUJA8FMgDg2mURW7Zf8lPeG90Rh9RR3r0xTnnT3vb8xO59HDJZ fEG0SBTuqicDgTFl6Q4zlT11XM4VnsbFBikHPrC5klUsvIw/kzgUtv+poeMgtFsrZ1 sYAke4Cgbd7KpHcPE+mEFNfuS57NmYbUFdWwBvkw/VsHufyecDK5JKYe4ih7tuMLmn /qyaAOpQCq3swbFaLw6SzPOxSk60ZLHYrFXHJFgFZE1hwVDkiMS36XXUfYTMq7L5uD eUI9w8kLz6u9g== X-Nifty-SrcIP: [209.85.217.44] Received: by mail-vs1-f44.google.com with SMTP id e126so10229777vsc.9; Wed, 31 Oct 2018 08:22:59 -0700 (PDT) X-Gm-Message-State: AGRZ1gK3v3eeuPVCRKP6nLqd1T7xW6MELrWPUlhNaCm33OPMBSmbl0TG Vb7RKFITY/D02NHPzCTIn7kXneWGi6/FonmFSjg= X-Google-Smtp-Source: AJdET5eFhdyn2AImd7r47wGujbB+RkCQGuMqa5gJWjHWbG2z9QV8GNr3Au5tC9Z5ei7yzkLvc9f8ZR/Z36IOarwEmXY= X-Received: by 2002:a67:385a:: with SMTP id f87mr1472529vsa.179.1540999377977; Wed, 31 Oct 2018 08:22:57 -0700 (PDT) MIME-Version: 1.0 References: <20181019120952.32763-1-hch@lst.de> <20181019120952.32763-2-hch@lst.de> In-Reply-To: <20181019120952.32763-2-hch@lst.de> From: Masahiro Yamada Date: Thu, 1 Nov 2018 00:22:21 +0900 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH 1/9] aha152x: rename the PCMCIA define To: Christoph Hellwig Cc: mporter@kernel.crashing.org, Alex Bounine , Dominik Brodowski , Linux Kbuild mailing list , linux-arm-kernel , linux-pci@vger.kernel.org, linux-scsi , linux-arch , Linux Kernel Mailing List , linuxppc-dev Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org On Fri, Oct 19, 2018 at 9:10 PM Christoph Hellwig wrote: > > We plan to enable building the PCMCIA core and drivers, and the > non-prefixed PCMCIA name clashes with some arch headers. > > Signed-off-by: Christoph Hellwig > Acked-by: Thomas Gleixner > --- Applied to linux-kbuild. > drivers/scsi/aha152x.c | 14 +++++++------- > drivers/scsi/pcmcia/aha152x_core.c | 2 +- > 2 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/drivers/scsi/aha152x.c b/drivers/scsi/aha152x.c > index 4d7b0e0adbf7..301b3cad15f8 100644 > --- a/drivers/scsi/aha152x.c > +++ b/drivers/scsi/aha152x.c > @@ -269,7 +269,7 @@ static LIST_HEAD(aha152x_host_list); > /* DEFINES */ > > /* For PCMCIA cards, always use AUTOCONF */ > -#if defined(PCMCIA) || defined(MODULE) > +#if defined(AHA152X_PCMCIA) || defined(MODULE) > #if !defined(AUTOCONF) > #define AUTOCONF > #endif > @@ -297,7 +297,7 @@ CMD_INC_RESID(struct scsi_cmnd *cmd, int inc) > > #define DELAY_DEFAULT 1000 > > -#if defined(PCMCIA) > +#if defined(AHA152X_PCMCIA) > #define IRQ_MIN 0 > #define IRQ_MAX 16 > #else > @@ -328,7 +328,7 @@ MODULE_AUTHOR("J=C3=BCrgen Fischer"); > MODULE_DESCRIPTION(AHA152X_REVID); > MODULE_LICENSE("GPL"); > > -#if !defined(PCMCIA) > +#if !defined(AHA152X_PCMCIA) > #if defined(MODULE) > static int io[] =3D {0, 0}; > module_param_hw_array(io, int, ioport, NULL, 0); > @@ -391,7 +391,7 @@ static struct isapnp_device_id id_table[] =3D { > MODULE_DEVICE_TABLE(isapnp, id_table); > #endif /* ISAPNP */ > > -#endif /* !PCMCIA */ > +#endif /* !AHA152X_PCMCIA */ > > static struct scsi_host_template aha152x_driver_template; > > @@ -863,7 +863,7 @@ void aha152x_release(struct Scsi_Host *shpnt) > if (shpnt->irq) > free_irq(shpnt->irq, shpnt); > > -#if !defined(PCMCIA) > +#if !defined(AHA152X_PCMCIA) > if (shpnt->io_port) > release_region(shpnt->io_port, IO_RANGE); > #endif > @@ -2924,7 +2924,7 @@ static struct scsi_host_template aha152x_driver_tem= plate =3D { > .slave_alloc =3D aha152x_adjust_queue, > }; > > -#if !defined(PCMCIA) > +#if !defined(AHA152X_PCMCIA) > static int setup_count; > static struct aha152x_setup setup[2]; > > @@ -3392,4 +3392,4 @@ static int __init aha152x_setup(char *str) > __setup("aha152x=3D", aha152x_setup); > #endif > > -#endif /* !PCMCIA */ > +#endif /* !AHA152X_PCMCIA */ > diff --git a/drivers/scsi/pcmcia/aha152x_core.c b/drivers/scsi/pcmcia/aha= 152x_core.c > index dba3716511c5..24b89228b241 100644 > --- a/drivers/scsi/pcmcia/aha152x_core.c > +++ b/drivers/scsi/pcmcia/aha152x_core.c > @@ -1,3 +1,3 @@ > -#define PCMCIA 1 > +#define AHA152X_PCMCIA 1 > #define AHA152X_STAT 1 > #include "aha152x.c" > -- > 2.19.1 > --=20 Best Regards Masahiro Yamada