Re: [PATCH] 2.4.17 compile error + fix

[Andrew Morton]

Phil Brutsche wrote:
> 
> --- linux/drivers/usb/usb-uhci.c        Fri Dec 21 11:41:55 2001
> +++ linux-2.4.17-modified/drivers/usb/usb-uhci.c        Sat Dec 22
> 22:10:27 2001
> @@ -3001,7 +3001,7 @@
>         s->irq = irq;
> 
>         if(uhci_start_usb (s) < 0) {
> -               uhci_pci_remove(dev);
> +               __devexit_p (uhci_pci_remove(dev));
>                 return -1;
>         }
>

If uhci_start_usb() fails, the driver still wants to call
uhci_pci_remove() to clean stuff up.  Same with bttv.

--- linux-2.4.17/drivers/media/video/bttv-driver.c	Fri Dec 21 11:19:13 2001
+++ linux-akpm/drivers/media/video/bttv-driver.c	Sat Dec 22 21:09:22 2001
@@ -2820,7 +2820,7 @@ static void bttv_irq(int irq, void *dev_
  *	Scan for a Bt848 card, request the irq and map the io memory 
  */
 
-static void __devexit bttv_remove(struct pci_dev *pci_dev)
+static void bttv_remove(struct pci_dev *pci_dev)
 {
         u8 command;
         int j;
@@ -3025,7 +3025,7 @@ static struct pci_driver bttv_pci_driver
         name:     "bttv",
         id_table: bttv_pci_tbl,
         probe:    bttv_probe,
-        remove:   __devexit_p(bttv_remove),
+        remove:   bttv_remove,
 };
 
 int bttv_init_module(void)
--- linux-2.4.17/drivers/usb/uhci.c	Fri Dec 21 11:19:14 2001
+++ linux-akpm/drivers/usb/uhci.c	Sat Dec 22 21:09:01 2001
@@ -2929,7 +2929,7 @@ static int __devinit uhci_pci_probe(stru
 	return -ENODEV;
 }
 
-static void __devexit uhci_pci_remove(struct pci_dev *dev)
+static void uhci_pci_remove(struct pci_dev *dev)
 {
 	struct uhci *uhci = pci_get_drvdata(dev);
 
@@ -2990,7 +2990,7 @@ static struct pci_driver uhci_pci_driver
 	id_table:	uhci_pci_ids,
 
 	probe:		uhci_pci_probe,
-	remove:		__devexit_p(uhci_pci_remove),
+	remove:		uhci_pci_remove,
 
 #ifdef	CONFIG_PM
 	suspend:	uhci_pci_suspend,