From: Richard Knutsson <ricknu-0@student.ltu.se>
To: kernel-janitors@vger.kernel.org
Subject: [KJ] [PATCH 2.6.17-rc1-mm2] net: cleanup CONFIG_PCI from dgrs.c
Date: Sun, 09 Apr 2006 17:23:10 +0000 [thread overview]
Message-ID: <443942FE.6060400@student.ltu.se> (raw)
From: Richard Knutsson <ricknu-0@student.ltu.se>
Removed (I believe) unnecessary CONFIG_PCI and an ugly (previous patch
of mine) empty struct if !CONFIG_PCI.
Compiled tested, with and without an "#undef CONFIG_PCI" in dgrs.c, with
no warnings/errors.
Signed-off-by: Richard Knutsson <ricknu-0@student.ltu.se>
---
dgrs.c | 8 +-------
1 files changed, 1 insertion(+), 7 deletions(-)
diff -Narup a/drivers/net/dgrs.c b/drivers/net/dgrs.c
--- a/drivers/net/dgrs.c 2006-04-09 15:47:43.000000000 +0200
+++ b/drivers/net/dgrs.c 2006-04-09 18:22:12.000000000 +0200
@@ -121,11 +121,11 @@ typedef unsigned int bool;
#include "dgrs_asstruct.h"
#include "dgrs_bcomm.h"
-#ifdef CONFIG_PCI
static struct pci_device_id dgrs_pci_tbl[] = {
{ SE6_PCI_VENDOR_ID, SE6_PCI_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID, },
{ } /* Terminating entry */
};
+#ifdef CONFIG_PCI
MODULE_DEVICE_TABLE(pci, dgrs_pci_tbl);
#endif
@@ -1381,7 +1381,6 @@ static void __devexit dgrs_remove(struct
}
}
-#ifdef CONFIG_PCI
static int __init dgrs_pci_probe(struct pci_dev *pdev,
const struct pci_device_id *ent)
{
@@ -1458,9 +1457,6 @@ static struct pci_driver dgrs_pci_driver
.probe = dgrs_pci_probe,
.remove = __devexit_p(dgrs_pci_remove),
};
-#else
-static struct pci_driver dgrs_pci_driver = {};
-#endif
#ifdef CONFIG_EISA
@@ -1608,9 +1604,7 @@ static void __exit dgrs_cleanup_module (
#ifdef CONFIG_EISA
eisa_driver_unregister (&dgrs_eisa_driver);
#endif
-#ifdef CONFIG_PCI
pci_unregister_driver (&dgrs_pci_driver);
-#endif
}
module_init(dgrs_init_module);
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
https://lists.osdl.org/mailman/listinfo/kernel-janitors
next reply other threads:[~2006-04-09 17:23 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-04-09 17:23 Richard Knutsson [this message]
2006-04-10 7:08 ` [KJ] [PATCH 2.6.17-rc1-mm2] net: cleanup CONFIG_PCI from dgrs.c Andrew Morton
2006-04-10 10:43 ` Richard Knutsson
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=443942FE.6060400@student.ltu.se \
--to=ricknu-0@student.ltu.se \
--cc=kernel-janitors@vger.kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.