From: Masahiro Yamada <yamada.masahiro@socionext.com>
To: Christoph Hellwig <hch@lst.de>
Cc: linux-arch <linux-arch@vger.kernel.org>,
linux-scsi <linux-scsi@vger.kernel.org>,
Linux Kbuild mailing list <linux-kbuild@vger.kernel.org>,
linux-pci@vger.kernel.org,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Dominik Brodowski <linux@dominikbrodowski.net>,
Alex Bounine <alex.bou9@gmail.com>,
linuxppc-dev <linuxppc-dev@lists.ozlabs.org>,
linux-arm-kernel <linux-arm-kernel@lists.infradead.org>
Subject: Re: [PATCH 1/9] aha152x: rename the PCMCIA define
Date: Thu, 1 Nov 2018 00:22:21 +0900 [thread overview]
Message-ID: <CAK7LNASCtHqB8DiA8NSNYY4823NwcOMV-3sS4RLFc8pfgEQD4w@mail.gmail.com> (raw)
In-Reply-To: <20181019120952.32763-2-hch@lst.de>
On Fri, Oct 19, 2018 at 9:10 PM Christoph Hellwig <hch@lst.de> 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 <hch@lst.de>
> Acked-by: Thomas Gleixner <tglx@linutronix.de>
> ---
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ürgen Fischer");
> MODULE_DESCRIPTION(AHA152X_REVID);
> MODULE_LICENSE("GPL");
>
> -#if !defined(PCMCIA)
> +#if !defined(AHA152X_PCMCIA)
> #if defined(MODULE)
> static int io[] = {0, 0};
> module_param_hw_array(io, int, ioport, NULL, 0);
> @@ -391,7 +391,7 @@ static struct isapnp_device_id id_table[] = {
> 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_template = {
> .slave_alloc = 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=", aha152x_setup);
> #endif
>
> -#endif /* !PCMCIA */
> +#endif /* !AHA152X_PCMCIA */
> diff --git a/drivers/scsi/pcmcia/aha152x_core.c b/drivers/scsi/pcmcia/aha152x_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
>
--
Best Regards
Masahiro Yamada
next prev parent reply other threads:[~2018-10-31 15:26 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-19 12:09 move bus (PCI, PCMCIA, EISA, rapdio) config to drivers/ v3 Christoph Hellwig
2018-10-19 12:09 ` [PATCH 1/9] aha152x: rename the PCMCIA define Christoph Hellwig
2018-10-31 15:22 ` Masahiro Yamada [this message]
2018-10-19 12:09 ` [PATCH 2/9] arm: remove EISA kconfig option Christoph Hellwig
2018-10-19 12:56 ` Masahiro Yamada
2018-10-19 12:09 ` [PATCH 3/9] powerpc: remove CONFIG_PCI_QSPAN Christoph Hellwig
2018-10-31 15:27 ` Masahiro Yamada
2018-10-19 12:09 ` [PATCH 4/9] powerpc: remove CONFIG_MCA leftovers Christoph Hellwig
2018-10-31 15:31 ` Masahiro Yamada
2018-10-19 12:09 ` [PATCH 5/9] powerpc: PCI_MSI needs PCI Christoph Hellwig
2018-10-19 15:10 ` Josh Triplett
2018-10-31 15:33 ` Masahiro Yamada
2018-10-19 12:09 ` [PATCH 6/9] PCI: consolidate PCI config entry in drivers/pci Christoph Hellwig
2018-10-19 12:22 ` Russell King - ARM Linux
2018-10-19 12:58 ` Masahiro Yamada
2018-10-31 16:05 ` Masahiro Yamada
2018-11-01 5:48 ` Christoph Hellwig
2018-11-01 10:24 ` Russell King - ARM Linux
2018-10-19 18:18 ` Palmer Dabbelt
2018-11-08 22:45 ` Bjorn Helgaas
2018-10-19 12:09 ` [PATCH 7/9] pcmcia: allow PCMCIA support independent of the architecture Christoph Hellwig
2018-10-19 12:09 ` [PATCH 8/9] rapidio: consolidate RAPIDIO config entry in drivers/rapidio Christoph Hellwig
2018-10-19 12:09 ` [PATCH 9/9] eisa: consolidate EISA Kconfig entry in drivers/eisa Christoph Hellwig
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=CAK7LNASCtHqB8DiA8NSNYY4823NwcOMV-3sS4RLFc8pfgEQD4w@mail.gmail.com \
--to=yamada.masahiro@socionext.com \
--cc=alex.bou9@gmail.com \
--cc=hch@lst.de \
--cc=linux-arch@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=linux@dominikbrodowski.net \
--cc=linuxppc-dev@lists.ozlabs.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;
as well as URLs for NNTP newsgroup(s).