From 7c37a1bf1d974f09fb83a4c6332b1f70583a31d3 Mon Sep 17 00:00:00 2001 From: Bjorn Helgaas Date: Fri, 16 Dec 2011 12:31:49 +0000 Subject: [PATCH] --- yaml --- r: 279019 b: refs/heads/master c: bc12d289e10afe0205738af30883853ed0ab6883 h: refs/heads/master i: 279017: c0473dd57c4023ade354ad73e600786eef199229 279015: e8ebd89459cde6dd177cf530a369aa3f573708da v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/sun/sunhme.c | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 8c68dec2cf39..1878bd9c7eb7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0a955c3a6f44927b81ae3bc91b0448eb104d8316 +refs/heads/master: bc12d289e10afe0205738af30883853ed0ab6883 diff --git a/trunk/drivers/net/ethernet/sun/sunhme.c b/trunk/drivers/net/ethernet/sun/sunhme.c index eebd52f10365..09c518655db2 100644 --- a/trunk/drivers/net/ethernet/sun/sunhme.c +++ b/trunk/drivers/net/ethernet/sun/sunhme.c @@ -2850,7 +2850,7 @@ static int __devinit happy_meal_sbus_probe_one(struct platform_device *op, int i static int is_quattro_p(struct pci_dev *pdev) { struct pci_dev *busdev = pdev->bus->self; - struct list_head *tmp; + struct pci_dev *this_pdev; int n_hmes; if (busdev == NULL || @@ -2859,15 +2859,10 @@ static int is_quattro_p(struct pci_dev *pdev) return 0; n_hmes = 0; - tmp = pdev->bus->devices.next; - while (tmp != &pdev->bus->devices) { - struct pci_dev *this_pdev = pci_dev_b(tmp); - + list_for_each_entry(this_pdev, &pdev->bus->devices, bus_list) { if (this_pdev->vendor == PCI_VENDOR_ID_SUN && this_pdev->device == PCI_DEVICE_ID_SUN_HAPPYMEAL) n_hmes++; - - tmp = tmp->next; } if (n_hmes != 4)