From: Adrian Bunk <bunk@stusta.de>
To: scottm@somanetworks.com, pcihpd-discuss@lists.sourceforge.net,
greg@kroah.com
Cc: linux-kernel@vger.kernel.org
Subject: [2.6 patch] drivers/pci/hotplug/ : simply use MODULE
Date: Sat, 11 Dec 2004 17:54:59 +0100 [thread overview]
Message-ID: <20041211165459.GV22324@stusta.de> (raw)
The patch below lets five files under drivers/pci/hotplug/ simply use
MODULE to check whether they are compiled as part of a module.
MODULE is the common idiom for checking whether a file is built as part
of a module.
In theory, my patch shouldn't have made any difference, but if you look
closely, the previous #if's in cpcihp_generic.c and cpci_hotplug_pci.c
weren't correct.
diffstat output:
drivers/pci/hotplug/cpci_hotplug_pci.c | 2 +-
drivers/pci/hotplug/cpcihp_generic.c | 2 +-
drivers/pci/hotplug/fakephp.c | 2 +-
drivers/pci/hotplug/ibmphp.h | 2 +-
drivers/pci/hotplug/shpchp.h | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
Signed-off-by: Adrian Bunk <bunk@stusta.de>
--- linux-2.6.10-rc2-mm4-full/drivers/pci/hotplug/ibmphp.h.old 2004-12-11 17:35:11.000000000 +0100
+++ linux-2.6.10-rc2-mm4-full/drivers/pci/hotplug/ibmphp.h 2004-12-11 17:35:26.000000000 +0100
@@ -34,7 +34,7 @@
extern int ibmphp_debug;
-#if !defined(CONFIG_HOTPLUG_PCI_IBM_MODULE)
+#if !defined(MODULE)
#define MY_NAME "ibmphpd"
#else
#define MY_NAME THIS_MODULE->name
--- linux-2.6.10-rc2-mm4-full/drivers/pci/hotplug/cpcihp_generic.c.old 2004-12-11 17:35:45.000000000 +0100
+++ linux-2.6.10-rc2-mm4-full/drivers/pci/hotplug/cpcihp_generic.c 2004-12-11 17:35:56.000000000 +0100
@@ -45,7 +45,7 @@
#define DRIVER_AUTHOR "Scott Murray <scottm@somanetworks.com>"
#define DRIVER_DESC "Generic port I/O CompactPCI Hot Plug Driver"
-#if !defined(CONFIG_HOTPLUG_CPCI_GENERIC_MODULE)
+#if !defined(MODULE)
#define MY_NAME "cpcihp_generic"
#else
#define MY_NAME THIS_MODULE->name
--- linux-2.6.10-rc2-mm4-full/drivers/pci/hotplug/cpci_hotplug_pci.c.old 2004-12-11 17:38:45.000000000 +0100
+++ linux-2.6.10-rc2-mm4-full/drivers/pci/hotplug/cpci_hotplug_pci.c 2004-12-11 17:38:58.000000000 +0100
@@ -32,7 +32,7 @@
#include "pci_hotplug.h"
#include "cpci_hotplug.h"
-#if !defined(CONFIG_HOTPLUG_CPCI_MODULE)
+#if !defined(MODULE)
#define MY_NAME "cpci_hotplug"
#else
#define MY_NAME THIS_MODULE->name
--- linux-2.6.10-rc2-mm4-full/drivers/pci/hotplug/fakephp.c.old 2004-12-11 17:39:14.000000000 +0100
+++ linux-2.6.10-rc2-mm4-full/drivers/pci/hotplug/fakephp.c 2004-12-11 17:39:23.000000000 +0100
@@ -40,7 +40,7 @@
#include "pci_hotplug.h"
#include "../pci.h"
-#if !defined(CONFIG_HOTPLUG_PCI_FAKE_MODULE)
+#if !defined(MODULE)
#define MY_NAME "fakephp"
#else
#define MY_NAME THIS_MODULE->name
--- linux-2.6.10-rc2-mm4-full/drivers/pci/hotplug/shpchp.h.old 2004-12-11 17:39:49.000000000 +0100
+++ linux-2.6.10-rc2-mm4-full/drivers/pci/hotplug/shpchp.h 2004-12-11 17:40:03.000000000 +0100
@@ -36,7 +36,7 @@
#include <asm/io.h>
#include "pci_hotplug.h"
-#if !defined(CONFIG_HOTPLUG_PCI_SHPC_MODULE)
+#if !defined(MODULE)
#define MY_NAME "shpchp"
#else
#define MY_NAME THIS_MODULE->name
next reply other threads:[~2004-12-11 16:57 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-12-11 16:54 Adrian Bunk [this message]
2004-12-13 0:11 ` [2.6 patch] drivers/pci/hotplug/ : simply use MODULE Scott Murray
2004-12-16 23:56 ` Greg KH
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=20041211165459.GV22324@stusta.de \
--to=bunk@stusta.de \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=pcihpd-discuss@lists.sourceforge.net \
--cc=scottm@somanetworks.com \
/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