Skip to content

Commit

Permalink
iwlegacy: clean up suspend/resume
Browse files Browse the repository at this point in the history
There's no need to export the il_pci_suspend
and il_pci_resume functions since they're only
referenced from il_pm_ops. The latter can also
be defined using SIMPLE_DEV_PM_OPS instead of
open-coding it.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Johannes Berg authored and John W. Linville committed Aug 10, 2012
1 parent 2f9279b commit 450e903
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 14 deletions.
15 changes: 3 additions & 12 deletions drivers/net/wireless/iwlegacy/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -4860,7 +4860,7 @@ EXPORT_SYMBOL(il_add_beacon_time);

#ifdef CONFIG_PM

int
static int
il_pci_suspend(struct device *device)
{
struct pci_dev *pdev = to_pci_dev(device);
Expand All @@ -4877,9 +4877,8 @@ il_pci_suspend(struct device *device)

return 0;
}
EXPORT_SYMBOL(il_pci_suspend);

int
static int
il_pci_resume(struct device *device)
{
struct pci_dev *pdev = to_pci_dev(device);
Expand All @@ -4906,16 +4905,8 @@ il_pci_resume(struct device *device)

return 0;
}
EXPORT_SYMBOL(il_pci_resume);

const struct dev_pm_ops il_pm_ops = {
.suspend = il_pci_suspend,
.resume = il_pci_resume,
.freeze = il_pci_suspend,
.thaw = il_pci_resume,
.poweroff = il_pci_suspend,
.restore = il_pci_resume,
};
SIMPLE_DEV_PM_OPS(il_pm_ops, il_pci_suspend, il_pci_resume);
EXPORT_SYMBOL(il_pm_ops);

#endif /* CONFIG_PM */
Expand Down
2 changes: 0 additions & 2 deletions drivers/net/wireless/iwlegacy/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -1845,8 +1845,6 @@ __le32 il_add_beacon_time(struct il_priv *il, u32 base, u32 addon,
u32 beacon_interval);

#ifdef CONFIG_PM
int il_pci_suspend(struct device *device);
int il_pci_resume(struct device *device);
extern const struct dev_pm_ops il_pm_ops;

#define IL_LEGACY_PM_OPS (&il_pm_ops)
Expand Down

0 comments on commit 450e903

Please sign in to comment.