From: Andrew Morton <akpm@zip.com.au>
To: Phil Brutsche <pbrutsch@tux.creighton.edu>
Cc: Marcelo Tosatti <marcelo@conectiva.com.br>, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] 2.4.17 compile error + fix
Date: Sat, 22 Dec 2001 21:14:57 -0800 [thread overview]
Message-ID: <3C256851.CD91C2A@zip.com.au> (raw)
In-Reply-To: <1009081736.968.0.camel@fury>
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,
next prev parent reply other threads:[~2001-12-23 5:17 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2001-12-23 4:28 [PATCH] 2.4.17 compile error + fix Phil Brutsche
2001-12-23 5:14 ` Keith Owens
2001-12-23 5:14 ` Andrew Morton [this message]
2001-12-23 19:29 ` 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=3C256851.CD91C2A@zip.com.au \
--to=akpm@zip.com.au \
--cc=linux-kernel@vger.kernel.org \
--cc=marcelo@conectiva.com.br \
--cc=pbrutsch@tux.creighton.edu \
/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.