From: Jeff Garzik <jgarzik@mandrakesoft.com>
To: davej@suse.de
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Alan Cox <alan@lxorguk.ukuu.org.uk>
Subject: Re: [PATCH] Remaining net/ pci_enable_device cleanups.
Date: Wed, 07 Feb 2001 22:48:17 -0500 [thread overview]
Message-ID: <3A821701.C7ED5ED2@mandrakesoft.com> (raw)
In-Reply-To: <Pine.LNX.4.31.0102072310240.29253-100000@athlon.local>
davej@suse.de wrote:
> diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/defxx.c linux-dj/drivers/net/defxx.c
> --- linux/drivers/net/defxx.c Wed Feb 7 21:55:56 2001
> +++ linux-dj/drivers/net/defxx.c Wed Feb 7 22:34:27 2001
applied
> diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/dgrs.c linux-dj/drivers/net/dgrs.c
> --- linux/drivers/net/dgrs.c Wed Feb 7 21:55:56 2001
> +++ linux-dj/drivers/net/dgrs.c Wed Feb 7 22:17:37 2001
applied
> diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/dmfe.c linux-dj/drivers/net/dmfe.c
> --- linux/drivers/net/dmfe.c Wed Feb 7 21:55:56 2001
> +++ linux-dj/drivers/net/dmfe.c Wed Feb 7 22:18:18 2001
> @@ -356,6 +356,11 @@
>
> DMFE_DBUG(0, "dmfe_probe()", 0);
>
> + /* Enable Master/IO access, Disable memory access */
> + if (pci_enable_device(pdev))
> + goto err_out;
> + pci_set_master(pdev);
not applied -- used this code instead:
/* Enable Master/IO access, Disable memory access */
i = pci_enable_device(pdev);
if (i) return i;
pci_set_master(pdev);
pci_read_config_word(pdev, PCI_COMMAND, &pci_command);
pci_comand &= ~PCI_COMMAND_MEM;
pci_write_config_word(pdev, PCI_COMMAND, pci_command);
> diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/eepro100.c linux-dj/drivers/net/eepro100.c
> --- linux/drivers/net/eepro100.c Wed Feb 7 21:55:56 2001
> +++ linux-dj/drivers/net/eepro100.c Wed Feb 7 22:00:35 2001
> @@ -557,6 +557,17 @@
> if (speedo_debug > 0 && did_version++ == 0)
> printk(version);
>
> + /* save power state b4 pci_enable_device overwrites it */
> + pm = pci_find_capability(pdev, PCI_CAP_ID_PM);
> + if (pm) {
> + u16 pwr_command;
> + pci_read_config_word(pdev, pm + PCI_PM_CTRL, &pwr_command);
> + acpi_idle_state = pwr_command & PCI_PM_CTRL_STATE_MASK;
> + }
> +
> + if (pci_enable_device(pdev))
> + goto err_out_none;
applied then modified: -ENODEV is rarely a descriptive return code on
pci_enable_device failure
> diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/epic100.c linux-dj/drivers/net/epic100.c
> --- linux/drivers/net/epic100.c Wed Feb 7 21:55:56 2001
> +++ linux-dj/drivers/net/epic100.c Wed Feb 7 22:15:22 2001
applied
> diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/natsemi.c linux-dj/drivers/net/natsemi.c
> --- linux/drivers/net/natsemi.c Wed Feb 7 21:55:56 2001
> +++ linux-dj/drivers/net/natsemi.c Wed Feb 7 22:03:05 2001
already applied/fixed
> diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/pcnet32.c linux-dj/drivers/net/pcnet32.c
> --- linux/drivers/net/pcnet32.c Wed Feb 7 21:55:57 2001
> +++ linux-dj/drivers/net/pcnet32.c Wed Feb 7 22:00:35 2001
> @@ -482,7 +482,12 @@
>
> printk(KERN_INFO "pcnet32_probe_pci: found device %#08x.%#08x\n", ent->vendor, ent->device);
>
> - ioaddr = pci_resource_start (pdev, 0);
> + if ((err = pci_enable_device(pdev)) < 0) {
> + printk(KERN_ERR "pcnet32.c: failed to enable device -- err=%d\n", err);
> + return err;
> + }
> +
> + ioaddr = pci_resource_start (pdev, 0);
applied, then fixed up the fubar'd indentation..
> diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/rcpci45.c linux-dj/drivers/net/rcpci45.c
> --- linux/drivers/net/rcpci45.c Wed Feb 7 21:55:57 2001
> +++ linux-dj/drivers/net/rcpci45.c Wed Feb 7 22:13:56 2001
applied
> diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/rtl8129.c linux-dj/drivers/net/rtl8129.c
> --- linux/drivers/net/rtl8129.c Wed Feb 7 21:55:57 2001
> +++ linux-dj/drivers/net/rtl8129.c Wed Feb 7 22:08:47 2001
not applied -- already met its demise in my tree :)
> diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/sis900.c linux-dj/drivers/net/sis900.c
> --- linux/drivers/net/sis900.c Wed Feb 7 21:55:57 2001
> +++ linux-dj/drivers/net/sis900.c Wed Feb 7 22:08:04 2001
applied
> diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/sundance.c linux-dj/drivers/net/sundance.c
> --- linux/drivers/net/sundance.c Mon Dec 11 21:38:29 2000
> +++ linux-dj/drivers/net/sundance.c Wed Feb 7 22:03:56 2001
applied
> diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/winbond-840.c linux-dj/drivers/net/winbond-840.c
> --- linux/drivers/net/winbond-840.c Wed Feb 7 21:56:00 2001
> +++ linux-dj/drivers/net/winbond-840.c Wed Feb 7 22:05:21 2001
applied
--
Jeff Garzik | "You see, in this world there's two kinds of
Building 1024 | people, my friend: Those with loaded guns
MandrakeSoft | and those who dig. You dig." --Blondie
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
Please read the FAQ at http://www.tux.org/lkml/
next prev parent reply other threads:[~2001-02-08 3:48 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2001-02-07 23:13 [PATCH] Remaining net/ pci_enable_device cleanups davej
2001-02-08 3:48 ` Jeff Garzik [this message]
2001-02-08 9:18 ` Francois romieu
2001-02-08 17:45 ` Jeff Garzik
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=3A821701.C7ED5ED2@mandrakesoft.com \
--to=jgarzik@mandrakesoft.com \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=davej@suse.de \
--cc=linux-kernel@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.