p54: unify ieee80211 device registration
PATCH 3/7 p54: unify ieee80211 device registration
All three drivers (p54pci, p54usb and p54spi) are implementing the same functionality three times. So, why not put it into the shared library?!
Signed-off-by Christian Lamparter <[email protected]>
---
drivers/net/wireless/p54/p54common.c +15 -0
@@ -2481,6 +2481,21 @@ struct ieee80211_hw *p54_init_common(siz }EXPORT_SYMBOL_GPL (p54_init_common); +int p54_register_common (struct ieee80211_hw *dev,struct device *pdev) +{ +int err; + + err =ieee80211_register_hw (dev); +if (err) { +dev_err (pdev,"Cannot register device (%d).\n" , err); +return err; + } + +dev_info (pdev,"is registered as '%s'\n" ,wiphy_name (dev->wiphy)); +return 0 ; +} +EXPORT_SYMBOL_GPL (p54_register_common); +void p54_free_common (struct ieee80211_hw *dev) {struct p54_common *priv = dev->priv;
drivers/net/wireless/p54/p54.h +1 -0
@@ -165,6 +165,7 @@ int p54_parse_firmware(struct ieee80211_int p54_parse_eeprom (struct ieee80211_hw *dev,void *eeprom,int len);int p54_read_eeprom (struct ieee80211_hw *dev);struct ieee80211_hw *p54_init_common (size_t priv_data_len); +int p54_register_common (struct ieee80211_hw *dev,struct device *pdev);void p54_free_common (struct ieee80211_hw *dev);#endif /* P54_H */
drivers/net/wireless/p54/p54pci.c +2 -5
@@ -565,12 +565,9 @@ static int __devinit p54p_probe(struct pif (err) goto err_free_common; - err =ieee80211_register_hw (dev); -if (err) { -printk (KERN_ERR "%s (p54pci): Cannot register netdevice\n" , -pci_name (pdev)); + err =p54_register_common (dev, &pdev->dev); +if (err) goto err_free_common; - }return 0 ;
drivers/net/wireless/p54/p54spi.c +2 -7
@@ -694,15 +694,10 @@ static int __devinit p54spi_probe(structif (ret) goto err_free_common; - ret =ieee80211_register_hw (hw); -if (ret) { -dev_err (&priv->spi->dev,"unable to register " -"mac80211 hw: %d" , ret); + ret =p54_register_common (hw, &priv->spi->dev); +if (ret) goto err_free_common; - } -dev_info (&priv->spi->dev,"device is bound to %s\n" , -wiphy_name (hw->wiphy));return 0 ; err_free_common:
drivers/net/wireless/p54/p54usb.c +2 -4
@@ -976,11 +976,9 @@ static int __devinit p54u_probe(struct uif (err) goto err_free_dev; - err =ieee80211_register_hw (dev); -if (err) { -dev_err (&udev->dev,"(p54usb) Cannot register netdevice\n" ); + err =p54_register_common (dev, &udev->dev); +if (err) goto err_free_dev; - }return 0 ;