From: Jim C. <jim...@gm...> - 2012-05-15 07:51:41
|
- add "static" back to acxpci_{probe,remove,suspend,resume}() - add __iomem to vars assigned from pci_iomap() - a few linewraps Signed-off-by: Jim Cromie <jim...@gm...> --- pci.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/pci.c b/pci.c index 9008267..45f20be 100644 --- a/pci.c +++ b/pci.c @@ -1080,9 +1080,8 @@ acx100pci_ioctl_set_phy_amp_bias(struct net_device *ndev, * id - ptr to the device id entry that matched this device */ #ifdef CONFIG_PCI -static -int __devinit -acxpci_probe(struct pci_dev *pdev, const struct pci_device_id *id) +static int __devinit acxpci_probe(struct pci_dev *pdev, + const struct pci_device_id *id) { acx111_ie_configoption_t co; unsigned long mem_region1 = 0; @@ -1449,10 +1448,10 @@ done: * * pdev - ptr to PCI device structure containing info about pci configuration */ -static -void __devexit acxpci_remove(struct pci_dev *pdev) +static void __devexit acxpci_remove(struct pci_dev *pdev) { - struct ieee80211_hw *hw = (struct ieee80211_hw *)pci_get_drvdata(pdev); + struct ieee80211_hw *hw + = (struct ieee80211_hw *) pci_get_drvdata(pdev); acx_device_t *adev = ieee2adev(hw); unsigned long mem_region1, mem_region2; @@ -1555,8 +1554,7 @@ void __devexit acxpci_remove(struct pci_dev *pdev) ** TODO: PM code needs to be fixed / debugged / tested. */ #ifdef CONFIG_PM -static -int acxpci_e_suspend(struct pci_dev *pdev, pm_message_t state) +static int acxpci_e_suspend(struct pci_dev *pdev, pm_message_t state) { struct ieee80211_hw *hw = pci_get_drvdata(pdev); acx_device_t *adev; @@ -1587,8 +1585,7 @@ int acxpci_e_suspend(struct pci_dev *pdev, pm_message_t state) return OK; } -static -int acxpci_e_resume(struct pci_dev *pdev) +static int acxpci_e_resume(struct pci_dev *pdev) { struct ieee80211_hw *hw = pci_get_drvdata(pdev); acx_device_t *adev; @@ -1782,7 +1779,8 @@ static __devinit int vlynq_probe(struct vlynq_device *vdev, FN_ENTER; - ieee = ieee80211_alloc_hw(sizeof(struct acx_device), &acxpci_hw_ops); + ieee = ieee80211_alloc_hw(sizeof(struct acx_device), + &acxpci_hw_ops); if (!ieee) { pr_acx("could not allocate ieee80211 structure %s\n", dev_name(&vdev->dev)); -- 1.7.10.1.487.ga3935e6 |