diff --git a/ath/if_ath_pci.c b/ath/if_ath_pci.c index 54715c1..96c6e6b 100644 --- a/ath/if_ath_pci.c +++ b/ath/if_ath_pci.c @@ -295,7 +295,7 @@ ath_pci_suspend(struct pci_dev *pdev, pm_message_t state) struct net_device *dev = pci_get_drvdata(pdev); ath_suspend(dev); - PCI_SAVE_STATE(pdev, ((struct ath_pci_softc *)netdev_priv(dev))->aps_pmstate); + pci_save_state(pdev); pci_disable_device(pdev); return pci_set_power_state(pdev, PCI_D3hot); } @@ -312,7 +312,7 @@ ath_pci_resume(struct pci_dev *pdev) return err; /* XXX - Should this return nonzero on fail? */ - PCI_RESTORE_STATE(pdev, ((struct ath_pci_softc *)netdev_priv(dev))->aps_pmstate); + pci_restore_state(pdev); err = pci_enable_device(pdev); if (err) diff --git a/ath/if_ath_pci.h b/ath/if_ath_pci.h index b6b4e69..23e504c 100644 --- a/ath/if_ath_pci.h +++ b/ath/if_ath_pci.h @@ -43,22 +43,10 @@ #include #define bus_map_single pci_map_single #define bus_unmap_single pci_unmap_single - #define bus_dma_sync_single pci_dma_sync_single_for_cpu -#define PCI_SAVE_STATE(a,b) pci_save_state(a) -#define PCI_RESTORE_STATE(a,b) pci_restore_state(a) - #define bus_alloc_consistent pci_alloc_consistent #define bus_free_consistent pci_free_consistent #define BUS_DMA_FROMDEVICE PCI_DMA_FROMDEVICE #define BUS_DMA_TODEVICE PCI_DMA_TODEVICE -#ifndef PCI_D0 -#define PCI_D0 0 -#endif - -#ifndef PCI_D3hot -#define PCI_D3hot 3 -#endif - #endif /* _DEV_ATH_PCI_H_ */