From: Hitesh K. Patel <[email protected]> pci_get_bus_and_slot isn't needed anymore.
Signed-off-by: Yun Tu(Mark Tu) <[email protected]> Signed-off-by: Hitesh K. Patel <[email protected]> --- drivers/staging/mrst/drv/psb_powermgmt.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/staging/mrst/drv/psb_powermgmt.c b/drivers/staging/mrst/drv/psb_powermgmt.c index decf38b..f692f10 100644 --- a/drivers/staging/mrst/drv/psb_powermgmt.c +++ b/drivers/staging/mrst/drv/psb_powermgmt.c @@ -1526,7 +1526,6 @@ static void ospm_suspend_pci(struct pci_dev *pdev) { struct drm_device *dev = pci_get_drvdata(pdev); struct drm_psb_private *dev_priv = dev->dev_private; - struct pci_dev *pci_gfx_root = pci_get_bus_and_slot(0, PCI_DEVFN(2, 0)); int bsm, vbt; if (gbSuspended) @@ -1535,11 +1534,10 @@ static void ospm_suspend_pci(struct pci_dev *pdev) /*printk(KERN_ALERT "ospm_suspend_pci\n");*/ pci_save_state(pdev); - pci_read_config_dword(pci_gfx_root, 0x5C, &bsm); + pci_read_config_dword(pdev, 0x5C, &bsm); dev_priv->saveBSM = bsm; - pci_read_config_dword(pci_gfx_root, 0xFC, &vbt); + pci_read_config_dword(pdev, 0xFC, &vbt); dev_priv->saveVBT = vbt; - pci_dev_put(pci_gfx_root); pci_read_config_dword(pdev, PSB_PCIx_MSI_ADDR_LOC, &dev_priv->msi_addr); pci_read_config_dword(pdev, PSB_PCIx_MSI_DATA_LOC, &dev_priv->msi_data); @@ -1559,7 +1557,6 @@ static bool ospm_resume_pci(struct pci_dev *pdev) { struct drm_device *dev = pci_get_drvdata(pdev); struct drm_psb_private *dev_priv = dev->dev_private; - struct pci_dev *pci_gfx_root = pci_get_bus_and_slot(0, PCI_DEVFN(2, 0)); int ret = 0; if (!gbSuspended) @@ -1569,9 +1566,8 @@ static bool ospm_resume_pci(struct pci_dev *pdev) pci_set_power_state(pdev, PCI_D0); pci_restore_state(pdev); - pci_write_config_dword(pci_gfx_root, 0x5c, dev_priv->saveBSM); - pci_write_config_dword(pci_gfx_root, 0xFC, dev_priv->saveVBT); - pci_dev_put(pci_gfx_root); + pci_write_config_dword(pdev, 0x5c, dev_priv->saveBSM); + pci_write_config_dword(pdev, 0xFC, dev_priv->saveVBT); /* retoring MSI address and data in PCIx space */ pci_write_config_dword(pdev, PSB_PCIx_MSI_ADDR_LOC, dev_priv->msi_addr); pci_write_config_dword(pdev, PSB_PCIx_MSI_DATA_LOC, dev_priv->msi_data); -- 1.7.1 _______________________________________________ MeeGo-kernel mailing list [email protected] http://lists.meego.com/listinfo/meego-kernel
