Skip to contentSkip to conversation

fix aic7xxx_old.c for !PCI

PATCH In review Adrian Bunk 2 participants 3 messages May 12, 2004 – May 13, 2004 SCSI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fix aic7xxx_old.c for !PCI

I got the following compile error in 2.6.6-mm1 (but it's not specific to -mm) with CONFIG_PCI=n:

<-- snip -->

...
CC drivers/scsi/aic7xxx_old.o
drivers/scsi/aic7xxx_old.c: In function `aic7xxx_release':
drivers/scsi/aic7xxx_old.c:10971: warning: implicit declaration of function `pci_release_regions'
...
LD .tmp_vmlinux1
drivers/built-in.o(.text+0x2bf0ff): In function `aic7xxx_release':
: undefined reference to `pci_release_regions'
make: *** [.tmp_vmlinux1] Error 1

<-- snip -->

The patch below fixes this issue.

Please apply
Adrian

drivers/scsi/aic7xxx_old.c renamed from drivers/scsi/aic7xxx_old.c.old +4 -0
@@ -9675,7 +9675,9 @@
           found++;
 	  continue;
 skip_pci_controller:
+#ifdef CONFIG_PCI
 	  pci_release_regions(temp_p->pdev);
+#endif
 	  kfree(temp_p);
         }  /* Found an Adaptec PCI device. */
         else /* Well, we found one, but we couldn't get any memory */
@@ -10967,8 +10969,10 @@
 #endif /* MMAPIO */
   if(!p->pdev)
     release_region(p->base, MAXREG - MINREG);
+#ifdef CONFIG_PCI
   else
     pci_release_regions(p->pdev);
+#endif
   prev = NULL;
   next = first_aic7xxx;
   while(next != NULL)
#1 lore raw
Quoted 2 lines · Adrian Bunk

I got the following compile error in 2.6.6-mm1 (but it's not specific to -mm) with CONFIG_PCI=n:

or how about just providing a dummy pci_release_regions() for the !PCI case ?

#2 lore raw
Quoted 6 lines · Arjan van de Ven
Quoted 2 lines · Adrian Bunk

I got the following compile error in 2.6.6-mm1 (but it's not specific to -mm) with CONFIG_PCI=n:

or how about just providing a dummy pci_release_regions() for the !PCI case ?

There's no dummy pci_request_regions(), and it might be hard to find a return value for a dummy pci_request_regions() that covers all cases.

I'm not religious about this issue, but a dummy pci_release_regions() without a dummy pci_request_regions() is a bit asymmetric.

cu
Adrian

Signature · 4 lines
       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed