From patchwork Tue Feb 9 22:16:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Shi X-Patchwork-Id: 61597 Delivered-To: patch@linaro.org Received: by 10.112.43.199 with SMTP id y7csp2311447lbl; Tue, 9 Feb 2016 14:39:28 -0800 (PST) X-Received: by 10.98.32.150 with SMTP id m22mr46531187pfj.27.1455057567990; Tue, 09 Feb 2016 14:39:27 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n76si347732pfb.81.2016.02.09.14.39.27; Tue, 09 Feb 2016 14:39:27 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dkim=pass header.i=@linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756280AbcBIWjZ (ORCPT + 30 others); Tue, 9 Feb 2016 17:39:25 -0500 Received: from mail-pa0-f48.google.com ([209.85.220.48]:36728 "EHLO mail-pa0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755863AbcBIWjY (ORCPT ); Tue, 9 Feb 2016 17:39:24 -0500 Received: by mail-pa0-f48.google.com with SMTP id yy13so891938pab.3 for ; Tue, 09 Feb 2016 14:39:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=7LobdLkLzi9b+x9YrsSIrDE6NTfDhafQnnsXBrVeQHM=; b=bmHE7elvsestN4JBMNtnyI+gx9l3uZogX+W25AmQsOYk/WJAscHO4uKvTkWX5nsG49 1PdHsS5cG8rC/Sz1aSi5OxXOFOU00nZElcsiKMUCJ0OOzH774QHXcvZutg3H1iRHcXxQ kTuH3/gYAgpLDsJQ0pQnwLNqszxULjLnuFTP0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=7LobdLkLzi9b+x9YrsSIrDE6NTfDhafQnnsXBrVeQHM=; b=Z3v+hlYkMgt6jad2gafEH4IHJqxy0cTY1dFtR08IZ1bKeWfYIx5CQjUAiPG0fEwANB hueh49tjJjl0oiywtop/7U4Mde7tRoLzop3mtcKq5Z8uta8d/uaWbLt/im5TNVYyKhVG 3cjFedqaaCeJzmoCOUPRe1jCf+y9Yn+ANpIqLJob2jEdJ3kHBk4b3gWZu0fNIuc0Zl1D W4rLonCYRBH7jZvz4JIEUlyTcXtSUt5KnPq7pGHG30rfYkgWhvBdw8KhTE4nbDtIC9ll B7KLkLZWpO5NdL1vqMfrK7n0yh4+DhRqHVIiNV6NcV86wkeEg0t2Ac9Lp69Ke2EjtC7S wOkQ== X-Gm-Message-State: AG10YOTEy3cPUJkoSgmcuwPjRQJvtIIoZwxjKlxs4KVnfgSdPTrnyW+DhKmNMxF4oSP3bqwf X-Received: by 10.66.141.165 with SMTP id rp5mr54158742pab.56.1455057563684; Tue, 09 Feb 2016 14:39:23 -0800 (PST) Received: from yshi-Precision-T5600.corp.ad.wrs.com (unknown-216-82.windriver.com. [147.11.216.82]) by smtp.gmail.com with ESMTPSA id m5sm134292pfi.84.2016.02.09.14.39.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Feb 2016 14:39:22 -0800 (PST) From: Yang Shi To: JBottomley@odin.com, martin.petersen@oracle.com Cc: linux-kernel@vger.kernel.org, linux-scsi@vger.kernel.org, linaro-kernel@lists.linaro.org, yang.shi@linaro.org Subject: [PATCH] scsi: fdomain: add missing CONFIG_ to PCMCIA Date: Tue, 9 Feb 2016 14:16:49 -0800 Message-Id: <1455056209-1696-1-git-send-email-yang.shi@linaro.org> X-Mailer: git-send-email 2.0.2 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org There are some "#ifdef PCMCIA" in the driver code, but all of them missed CONFIG_ prefix. Correct PCMCIA to CONFIG_PCMCIA. Signed-off-by: Yang Shi --- I happened to find this problem when I was tracking down another problem, however this driver looks very old, not sure if anybody cares about it or not. Anyway, it is harmless to come up with a patch to get it corrected. drivers/scsi/fdomain.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) -- 2.0.2 diff --git a/drivers/scsi/fdomain.c b/drivers/scsi/fdomain.c index eefe14d..ffc9187 100644 --- a/drivers/scsi/fdomain.c +++ b/drivers/scsi/fdomain.c @@ -290,7 +290,7 @@ #include #include "fdomain.h" -#ifndef PCMCIA +#ifndef CONFIG_PCMCIA MODULE_AUTHOR("Rickard E. Faith"); MODULE_DESCRIPTION("Future domain SCSI driver"); MODULE_LICENSE("GPL"); @@ -414,7 +414,7 @@ static irqreturn_t do_fdomain_16x0_intr( int irq, void *dev_id ); static char * fdomain = NULL; module_param(fdomain, charp, 0); -#ifndef PCMCIA +#ifndef CONFIG_PCMCIA static unsigned long addresses[] = { 0xc8000, @@ -432,7 +432,7 @@ static unsigned short ports[] = { 0x140, 0x150, 0x160, 0x170 }; static unsigned short ints[] = { 3, 5, 10, 11, 12, 14, 15, 0 }; -#endif /* !PCMCIA */ +#endif /* !CONFIG_PCMCIA */ /* @@ -466,7 +466,7 @@ static unsigned short ints[] = { 3, 5, 10, 11, 12, 14, 15, 0 }; */ -#ifndef PCMCIA +#ifndef CONFIG_PCMCIA static struct signature { const char *signature; @@ -513,7 +513,7 @@ static struct signature { #define SIGNATURE_COUNT ARRAY_SIZE(signatures) -#endif /* !PCMCIA */ +#endif /* !CONFIG_PCMCIA */ static void print_banner( struct Scsi_Host *shpnt ) { @@ -645,7 +645,7 @@ static int fdomain_test_loopback( void ) return 0; } -#ifndef PCMCIA +#ifndef CONFIG_PCMCIA /* fdomain_get_irq assumes that we have a valid MCA ID for a TMC-1660/TMC-1680 Future Domain board. Now, check to be sure the @@ -801,7 +801,7 @@ found: return 1; /* success */ } -#else /* PCMCIA */ +#else /* CONFIG_PCMCIA */ static int fdomain_isa_detect( int *irq, int *iobase ) { @@ -812,7 +812,7 @@ static int fdomain_isa_detect( int *irq, int *iobase ) return 0; } -#endif /* !PCMCIA */ +#endif /* !CONFIG_PCMCIA */ /* PCI detection function: int fdomain_pci_bios_detect(int* irq, int* @@ -1767,7 +1767,7 @@ struct scsi_host_template fdomain_driver_template = { .use_clustering = DISABLE_CLUSTERING, }; -#ifndef PCMCIA +#ifndef CONFIG_PCMCIA #ifdef CONFIG_PCI static struct pci_device_id fdomain_pci_tbl[] = {