| Message ID | 1369818032-36272-1-git-send-email-wangyijing@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
On Wed, 2013-05-29 at 17:00 +0800, Yijing Wang wrote: > Pci_enable_device() will set device pm state to D0, so > it's no need to do it again in tg3_init_one(). > > Signed-off-by: Yijing Wang <wangyijing@huawei.com> Acked-by: Michael Chan <mchan@broadcom.com> > --- > drivers/net/ethernet/broadcom/tg3.c | 20 +------------------- > 1 files changed, 1 insertions(+), 19 deletions(-) > > diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c > index 728d42a..1396ab3 100644 > --- a/drivers/net/ethernet/broadcom/tg3.c > +++ b/drivers/net/ethernet/broadcom/tg3.c > @@ -17042,25 +17042,10 @@ static int tg3_init_one(struct pci_dev *pdev, > > pci_set_master(pdev); > > - /* Find power-management capability. */ > - pm_cap = pci_find_capability(pdev, PCI_CAP_ID_PM); > - if (pm_cap == 0) { > - dev_err(&pdev->dev, > - "Cannot find Power Management capability, aborting\n"); > - err = -EIO; > - goto err_out_free_res; > - } > - > - err = pci_set_power_state(pdev, PCI_D0); > - if (err) { > - dev_err(&pdev->dev, "Transition to D0 failed, aborting\n"); > - goto err_out_free_res; > - } > - > dev = alloc_etherdev_mq(sizeof(*tp), TG3_IRQ_MAX_VECS); > if (!dev) { > err = -ENOMEM; > - goto err_out_power_down; > + goto err_out_free_res; > } > > SET_NETDEV_DEV(dev, &pdev->dev); > @@ -17406,9 +17391,6 @@ err_out_iounmap: > err_out_free_dev: > free_netdev(dev); > > -err_out_power_down: > - pci_set_power_state(pdev, PCI_D3hot); > - > err_out_free_res: > pci_release_regions(pdev); > -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
RnJvbTogWWlqaW5nIFdhbmcgPHdhbmd5aWppbmdAaHVhd2VpLmNvbT4NCkRhdGU6IFdlZCwgMjkg TWF5IDIwMTMgMTc6MDA6MzIgKzA4MDANCg0KPiBQY2lfZW5hYmxlX2RldmljZSgpIHdpbGwgc2V0 IGRldmljZSBwbSBzdGF0ZSB0byBEMCwgc28NCj4gaXQncyBubyBuZWVkIHRvIGRvIGl0IGFnYWlu IGluIHRnM19pbml0X29uZSgpLg0KPiANCj4gU2lnbmVkLW9mZi1ieTogWWlqaW5nIFdhbmcgPHdh bmd5aWppbmdAaHVhd2VpLmNvbT4NCg0KVGhpcyBwYXRjaCBpbnRyb2R1Y2VzIGEgd2FybmluZzoN Cg0KZHJpdmVycy9uZXQvZXRoZXJuZXQvYnJvYWRjb20vdGczLmM6IEluIGZ1bmN0aW9uIKF0ZzNf aW5pdF9vbmWiOg0KZHJpdmVycy9uZXQvZXRoZXJuZXQvYnJvYWRjb20vdGczLmM6MTcyMzE6MTM6 IHdhcm5pbmc6IKFwbV9jYXCiIG1heSBiZSB1c2VkIHVuaW5pdGlhbGl6ZWQgaW4gdGhpcyBmdW5j dGlvbiBbLVd1bmluaXRpYWxpemVkXQ0K -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 2013/6/3 15:13, David Miller wrote: > From: Yijing Wang <wangyijing@huawei.com> > Date: Wed, 29 May 2013 17:00:32 +0800 > >> Pci_enable_device() will set device pm state to D0, so >> it's no need to do it again in tg3_init_one(). >> >> Signed-off-by: Yijing Wang <wangyijing@huawei.com> > > This patch introduces a warning: > > drivers/net/ethernet/broadcom/tg3.c: In function ‘tg3_init_one’: > drivers/net/ethernet/broadcom/tg3.c:17231:13: warning: ‘pm_cap’ may be used uninitialized in this function [-Wuninitialized] > Sorry, I will update it and resend soon. Thanks! Yijing.
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c index 728d42a..1396ab3 100644 --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c @@ -17042,25 +17042,10 @@ static int tg3_init_one(struct pci_dev *pdev, pci_set_master(pdev); - /* Find power-management capability. */ - pm_cap = pci_find_capability(pdev, PCI_CAP_ID_PM); - if (pm_cap == 0) { - dev_err(&pdev->dev, - "Cannot find Power Management capability, aborting\n"); - err = -EIO; - goto err_out_free_res; - } - - err = pci_set_power_state(pdev, PCI_D0); - if (err) { - dev_err(&pdev->dev, "Transition to D0 failed, aborting\n"); - goto err_out_free_res; - } - dev = alloc_etherdev_mq(sizeof(*tp), TG3_IRQ_MAX_VECS); if (!dev) { err = -ENOMEM; - goto err_out_power_down; + goto err_out_free_res; } SET_NETDEV_DEV(dev, &pdev->dev); @@ -17406,9 +17391,6 @@ err_out_iounmap: err_out_free_dev: free_netdev(dev); -err_out_power_down: - pci_set_power_state(pdev, PCI_D3hot); - err_out_free_res: pci_release_regions(pdev);
Pci_enable_device() will set device pm state to D0, so it's no need to do it again in tg3_init_one(). Signed-off-by: Yijing Wang <wangyijing@huawei.com> --- drivers/net/ethernet/broadcom/tg3.c | 20 +------------------- 1 files changed, 1 insertions(+), 19 deletions(-)