Skip to content

Commit

Permalink
ksz884x: use generic power management
Browse files Browse the repository at this point in the history
With legacy PM, drivers themselves were responsible for managing the
device's power states and takes care of register states.

After upgrading to the generic structure, PCI core will take care of
required tasks and drivers should do only device-specific operations.

Thus, there is no need to call the PCI helper functions like
pci_enable_wake(), pci_save/restore_sate() and
pci_set_power_state().

Compile-tested only.

Signed-off-by: Vaibhav Gupta <vaibhavgupta40@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Vaibhav Gupta authored and David S. Miller committed Jul 1, 2020
1 parent 0e3e206 commit 6412061
Showing 1 changed file with 9 additions and 16 deletions.
25 changes: 9 additions & 16 deletions drivers/net/ethernet/micrel/ksz884x.c
Original file line number Diff line number Diff line change
Expand Up @@ -7155,17 +7155,14 @@ static void pcidev_exit(struct pci_dev *pdev)
kfree(info);
}

#ifdef CONFIG_PM
static int pcidev_resume(struct pci_dev *pdev)
static int __maybe_unused pcidev_resume(struct device *dev_d)
{
int i;
struct platform_info *info = pci_get_drvdata(pdev);
struct platform_info *info = dev_get_drvdata(dev_d);
struct dev_info *hw_priv = &info->dev_info;
struct ksz_hw *hw = &hw_priv->hw;

pci_set_power_state(pdev, PCI_D0);
pci_restore_state(pdev);
pci_enable_wake(pdev, PCI_D0, 0);
device_wakeup_disable(dev_d);

if (hw_priv->wol_enable)
hw_cfg_wol_pme(hw, 0);
Expand All @@ -7182,10 +7179,10 @@ static int pcidev_resume(struct pci_dev *pdev)
return 0;
}

static int pcidev_suspend(struct pci_dev *pdev, pm_message_t state)
static int pcidev_suspend(struct device *dev_d)
{
int i;
struct platform_info *info = pci_get_drvdata(pdev);
struct platform_info *info = dev_get_drvdata(dev_d);
struct dev_info *hw_priv = &info->dev_info;
struct ksz_hw *hw = &hw_priv->hw;

Expand All @@ -7207,12 +7204,9 @@ static int pcidev_suspend(struct pci_dev *pdev, pm_message_t state)
hw_cfg_wol_pme(hw, 1);
}

pci_save_state(pdev);
pci_enable_wake(pdev, pci_choose_state(pdev, state), 1);
pci_set_power_state(pdev, pci_choose_state(pdev, state));
device_wakeup_enable(dev_d);
return 0;
}
#endif

static char pcidev_name[] = "ksz884xp";

Expand All @@ -7226,11 +7220,10 @@ static const struct pci_device_id pcidev_table[] = {

MODULE_DEVICE_TABLE(pci, pcidev_table);

static SIMPLE_DEV_PM_OPS(pcidev_pm_ops, pcidev_suspend, pcidev_resume);

static struct pci_driver pci_device_driver = {
#ifdef CONFIG_PM
.suspend = pcidev_suspend,
.resume = pcidev_resume,
#endif
.driver.pm = &pcidev_pm_ops,
.name = pcidev_name,
.id_table = pcidev_table,
.probe = pcidev_init,
Expand Down

0 comments on commit 6412061

Please sign in to comment.