b43: Split PHY alloc and init

[linux-2.6-omap-h63xx.git] / drivers / net / wireless / b43 / phy_n.c

diff --git a/drivers/net/wireless/b43/phy_n.c b/drivers/net/wireless/b43/phy_n.c
index 8162fd7792ff7433e811e0e3ef0603b594bf87f8..617724dc6aa81843dff38bfd4c0c8d42af4455a1 100644 (file)
--- a/drivers/net/wireless/b43/phy_n.c
+++ b/drivers/net/wireless/b43/phy_n.c
@@ -499,35 +499,31 @@ static int b43_nphy_op_allocate(struct b43_wldev *dev)
                return -ENOMEM;
        dev->phy.n = nphy;
 
-       //TODO init struct b43_phy_n
-
        return 0;
 }
 
-static int b43_nphy_op_init(struct b43_wldev *dev)
+static void b43_nphy_op_prepare_structs(struct b43_wldev *dev)
 {
-       struct b43_phy_n *nphy = dev->phy.n;
-       int err;
+       struct b43_phy *phy = &dev->phy;
+       struct b43_phy_n *nphy = phy->n;
 
-       err = b43_phy_initn(dev);
-       if (err)
-               return err;
-       nphy->initialised = 1;
+       memset(nphy, 0, sizeof(*nphy));
 
-       return 0;
+       //TODO init struct b43_phy_n
 }
 
-static void b43_nphy_op_exit(struct b43_wldev *dev)
+static void b43_nphy_op_free(struct b43_wldev *dev)
 {
-       struct b43_phy_n *nphy = dev->phy.n;
+       struct b43_phy *phy = &dev->phy;
+       struct b43_phy_n *nphy = phy->n;
 
-       if (nphy->initialised) {
-               //TODO
-               nphy->initialised = 0;
-       }
-       //TODO
        kfree(nphy);
-       dev->phy.n = NULL;
+       phy->n = NULL;
+}
+
+static int b43_nphy_op_init(struct b43_wldev *dev)
+{
+       return b43_phy_initn(dev);
 }
 
 static inline void check_phyreg(struct b43_wldev *dev, u16 offset)
@@ -610,8 +606,9 @@ static unsigned int b43_nphy_op_get_default_chan(struct b43_wldev *dev)
 
 const struct b43_phy_operations b43_phyops_n = {
        .allocate               = b43_nphy_op_allocate,
+       .free                   = b43_nphy_op_free,
+       .prepare_structs        = b43_nphy_op_prepare_structs,
        .init                   = b43_nphy_op_init,
-       .exit                   = b43_nphy_op_exit,
        .phy_read               = b43_nphy_op_read,
        .phy_write              = b43_nphy_op_write,
        .radio_read             = b43_nphy_op_radio_read,