ChangeSet 1.2231.1.172, 2005/03/28 20:04:14-08:00, [EMAIL PROTECTED]
[PATCH] Fix compile warning in drivers/pnp/resource.c with !CONFIG_PCI
drivers/pnp/resource.c:24: warning: `pnp_skip_pci_scan' defined but not
used
Signed-off-by: Mika Kukkonen ([EMAIL PROTECTED])
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
resource.c | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff -Nru a/drivers/pnp/resource.c b/drivers/pnp/resource.c
--- a/drivers/pnp/resource.c 2005-03-28 21:44:25 -08:00
+++ b/drivers/pnp/resource.c 2005-03-28 21:44:25 -08:00
@@ -21,7 +21,6 @@
#include <linux/pnp.h>
#include "base.h"
-static int pnp_skip_pci_scan; /* skip PCI resource
scanning */
static int pnp_reserve_irq[16] = { [0 ... 15] = -1 }; /* reserve (don't use)
some IRQ */
static int pnp_reserve_dma[8] = { [0 ... 7] = -1 }; /* reserve (don't use)
some DMA */
static int pnp_reserve_io[16] = { [0 ... 15] = -1 }; /* reserve (don't use)
some I/O region */
@@ -385,9 +384,9 @@
#ifdef CONFIG_PCI
/* check if the resource is being used by a pci device */
- if (!pnp_skip_pci_scan) {
- struct pci_dev * pci = NULL;
- while ((pci = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, pci)) !=
NULL) {
+ {
+ struct pci_dev *pci = NULL;
+ for_each_pci_dev(pci) {
if (pci->irq == *irq)
return 0;
}
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
