Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

tg3: remove redundant pm init code

Pci_enable_device() will set device pm state to D0, so
it's no need to do it again in tg3_init_one().

Acked-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: Yijing Wang <wangyijing@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Yijing Wang and committed by
David S. Miller
5865fc1b 6b1ea4b2

+3 -21
+3 -21
drivers/net/ethernet/broadcom/tg3.c
··· 17195 17195 { 17196 17196 struct net_device *dev; 17197 17197 struct tg3 *tp; 17198 - int i, err, pm_cap; 17198 + int i, err; 17199 17199 u32 sndmbx, rcvmbx, intmbx; 17200 17200 char str[40]; 17201 17201 u64 dma_mask, persist_dma_mask; ··· 17217 17217 17218 17218 pci_set_master(pdev); 17219 17219 17220 - /* Find power-management capability. */ 17221 - pm_cap = pci_find_capability(pdev, PCI_CAP_ID_PM); 17222 - if (pm_cap == 0) { 17223 - dev_err(&pdev->dev, 17224 - "Cannot find Power Management capability, aborting\n"); 17225 - err = -EIO; 17226 - goto err_out_free_res; 17227 - } 17228 - 17229 - err = pci_set_power_state(pdev, PCI_D0); 17230 - if (err) { 17231 - dev_err(&pdev->dev, "Transition to D0 failed, aborting\n"); 17232 - goto err_out_free_res; 17233 - } 17234 - 17235 17220 dev = alloc_etherdev_mq(sizeof(*tp), TG3_IRQ_MAX_VECS); 17236 17221 if (!dev) { 17237 17222 err = -ENOMEM; 17238 - goto err_out_power_down; 17223 + goto err_out_free_res; 17239 17224 } 17240 17225 17241 17226 SET_NETDEV_DEV(dev, &pdev->dev); ··· 17228 17243 tp = netdev_priv(dev); 17229 17244 tp->pdev = pdev; 17230 17245 tp->dev = dev; 17231 - tp->pm_cap = pm_cap; 17246 + tp->pm_cap = pdev->pm_cap; 17232 17247 tp->rx_mode = TG3_DEF_RX_MODE; 17233 17248 tp->tx_mode = TG3_DEF_TX_MODE; 17234 17249 tp->irq_sync = 1; ··· 17565 17580 17566 17581 err_out_free_dev: 17567 17582 free_netdev(dev); 17568 - 17569 - err_out_power_down: 17570 - pci_set_power_state(pdev, PCI_D3hot); 17571 17583 17572 17584 err_out_free_res: 17573 17585 pci_release_regions(pdev);