* [patch 11/26] janitor: net/tg3: pci_find_device to pci_dev_present
@ 2005-03-06 10:33 domen
2005-03-09 20:25 ` Jeff Garzik
0 siblings, 1 reply; 3+ messages in thread
From: domen @ 2005-03-06 10:33 UTC (permalink / raw)
To: jgarzik; +Cc: netdev, domen, sfeldma, janitor
Replace pci_find_device with pci_dev_present. Compile tested.
Signed-off-by: Scott Feldman <sfeldma@pobox.com>
Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
Signed-off-by: Domen Puncer <domen@coderock.org>
---
kj-domen/drivers/net/tg3.c | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff -puN drivers/net/tg3.c~remove-pci-find-device-drivers_net_tg3 drivers/net/tg3.c
--- kj/drivers/net/tg3.c~remove-pci-find-device-drivers_net_tg3 2005-03-05 16:09:45.000000000 +0100
+++ kj-domen/drivers/net/tg3.c 2005-03-05 16:09:45.000000000 +0100
@@ -7829,6 +7829,19 @@ static int __devinit tg3_is_sun_570X(str
static int __devinit tg3_get_invariants(struct tg3 *tp)
{
+ static struct pci_device_id write_reorder_chipsets[] = {
+ { PCI_DEVICE(PCI_VENDOR_ID_INTEL,
+ PCI_DEVICE_ID_INTEL_82801AA_8) },
+ { PCI_DEVICE(PCI_VENDOR_ID_INTEL,
+ PCI_DEVICE_ID_INTEL_82801AB_8) },
+ { PCI_DEVICE(PCI_VENDOR_ID_INTEL,
+ PCI_DEVICE_ID_INTEL_82801BA_11) },
+ { PCI_DEVICE(PCI_VENDOR_ID_INTEL,
+ PCI_DEVICE_ID_INTEL_82801BA_6) },
+ { PCI_DEVICE(PCI_VENDOR_ID_AMD,
+ PCI_DEVICE_ID_AMD_FE_GATE_700C) },
+ { },
+ };
u32 misc_ctrl_reg;
u32 cacheline_sz_reg;
u32 pci_state_reg, grc_misc_cfg;
@@ -7847,16 +7860,7 @@ static int __devinit tg3_get_invariants(
* every mailbox register write to force the writes to be
* posted to the chip in order.
*/
- if (pci_find_device(PCI_VENDOR_ID_INTEL,
- PCI_DEVICE_ID_INTEL_82801AA_8, NULL) ||
- pci_find_device(PCI_VENDOR_ID_INTEL,
- PCI_DEVICE_ID_INTEL_82801AB_8, NULL) ||
- pci_find_device(PCI_VENDOR_ID_INTEL,
- PCI_DEVICE_ID_INTEL_82801BA_11, NULL) ||
- pci_find_device(PCI_VENDOR_ID_INTEL,
- PCI_DEVICE_ID_INTEL_82801BA_6, NULL) ||
- pci_find_device(PCI_VENDOR_ID_AMD,
- PCI_DEVICE_ID_AMD_FE_GATE_700C, NULL))
+ if (pci_dev_present(write_reorder_chipsets))
tp->tg3_flags |= TG3_FLAG_MBOX_WRITE_REORDER;
/* Force memory write invalidate off. If we leave it on,
_
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [patch 11/26] janitor: net/tg3: pci_find_device to pci_dev_present
2005-03-06 10:33 [patch 11/26] janitor: net/tg3: pci_find_device to pci_dev_present domen
@ 2005-03-09 20:25 ` Jeff Garzik
2005-03-11 2:23 ` David S. Miller
0 siblings, 1 reply; 3+ messages in thread
From: Jeff Garzik @ 2005-03-09 20:25 UTC (permalink / raw)
To: domen; +Cc: netdev, sfeldma, janitor, David S. Miller
domen@coderock.org wrote:
> Replace pci_find_device with pci_dev_present. Compile tested.
>
> Signed-off-by: Scott Feldman <sfeldma@pobox.com>
> Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
> Signed-off-by: Domen Puncer <domen@coderock.org>
> ---
>
>
> kj-domen/drivers/net/tg3.c | 24 ++++++++++++++----------
> 1 files changed, 14 insertions(+), 10 deletions(-)
>
> diff -puN drivers/net/tg3.c~remove-pci-find-device-drivers_net_tg3 drivers/net/tg3.c
> --- kj/drivers/net/tg3.c~remove-pci-find-device-drivers_net_tg3 2005-03-05 16:09:45.000000000 +0100
> +++ kj-domen/drivers/net/tg3.c 2005-03-05 16:09:45.000000000 +0100
> @@ -7829,6 +7829,19 @@ static int __devinit tg3_is_sun_570X(str
>
> static int __devinit tg3_get_invariants(struct tg3 *tp)
> {
> + static struct pci_device_id write_reorder_chipsets[] = {
> + { PCI_DEVICE(PCI_VENDOR_ID_INTEL,
> + PCI_DEVICE_ID_INTEL_82801AA_8) },
> + { PCI_DEVICE(PCI_VENDOR_ID_INTEL,
> + PCI_DEVICE_ID_INTEL_82801AB_8) },
> + { PCI_DEVICE(PCI_VENDOR_ID_INTEL,
> + PCI_DEVICE_ID_INTEL_82801BA_11) },
> + { PCI_DEVICE(PCI_VENDOR_ID_INTEL,
> + PCI_DEVICE_ID_INTEL_82801BA_6) },
> + { PCI_DEVICE(PCI_VENDOR_ID_AMD,
> + PCI_DEVICE_ID_AMD_FE_GATE_700C) },
> + { },
> + };
> u32 misc_ctrl_reg;
> u32 cacheline_sz_reg;
> u32 pci_state_reg, grc_misc_cfg;
> @@ -7847,16 +7860,7 @@ static int __devinit tg3_get_invariants(
> * every mailbox register write to force the writes to be
> * posted to the chip in order.
> */
> - if (pci_find_device(PCI_VENDOR_ID_INTEL,
> - PCI_DEVICE_ID_INTEL_82801AA_8, NULL) ||
> - pci_find_device(PCI_VENDOR_ID_INTEL,
> - PCI_DEVICE_ID_INTEL_82801AB_8, NULL) ||
> - pci_find_device(PCI_VENDOR_ID_INTEL,
> - PCI_DEVICE_ID_INTEL_82801BA_11, NULL) ||
> - pci_find_device(PCI_VENDOR_ID_INTEL,
> - PCI_DEVICE_ID_INTEL_82801BA_6, NULL) ||
> - pci_find_device(PCI_VENDOR_ID_AMD,
> - PCI_DEVICE_ID_AMD_FE_GATE_700C, NULL))
> + if (pci_dev_present(write_reorder_chipsets))
> tp->tg3_flags |= TG3_FLAG_MBOX_WRITE_REORDER;
seems OK to me. DaveM should be applying this, though.
Jeff
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [patch 11/26] janitor: net/tg3: pci_find_device to pci_dev_present
2005-03-09 20:25 ` Jeff Garzik
@ 2005-03-11 2:23 ` David S. Miller
0 siblings, 0 replies; 3+ messages in thread
From: David S. Miller @ 2005-03-11 2:23 UTC (permalink / raw)
To: Jeff Garzik; +Cc: domen, netdev, sfeldma, janitor
On Wed, 09 Mar 2005 15:25:42 -0500
Jeff Garzik <jgarzik@pobox.com> wrote:
> domen@coderock.org wrote:
> > Replace pci_find_device with pci_dev_present. Compile tested.
...
> seems OK to me. DaveM should be applying this, though.
Applied, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2005-03-11 2:23 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-03-06 10:33 [patch 11/26] janitor: net/tg3: pci_find_device to pci_dev_present domen
2005-03-09 20:25 ` Jeff Garzik
2005-03-11 2:23 ` David S. Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).