Changeset 35543

Timestamp:

2013-02-10T19:42:04+01:00 (5 years ago)

Author:

juhosg

Message:

generic: ar8216: add ar8xxx_create{,mii} helpers

Signed-off-by: Gabor Juhos <juhosg@…>

File:

• trunk/target/linux/generic/files/drivers/net/phy/ar8216.c (modified) (4 diffs)

trunk/target/linux/generic/files/drivers/net/phy/ar8216.c

@@ -1743 +1743 @@
                 return -ENOMEM;
 
+        return 0;
+}
+
+static void
+ar8xxx_mib_start(struct ar8216_priv *priv)
+{
+        if (!ar8xxx_has_mib_counters(priv))
+                return;
+
+        schedule_delayed_work(&priv->mib_work,
+                              msecs_to_jiffies(AR8XXX_MIB_WORK_DELAY));
+}
+
+static void
+ar8xxx_mib_cleanup(struct ar8216_priv *priv)
+{
+        if (!ar8xxx_has_mib_counters(priv))
+                return;
+
+        cancel_delayed_work(&priv->mib_work);
+        kfree(priv->mib_stats);
+}
+
+static struct ar8216_priv *
+ar8xxx_create(void)
+{
+        struct ar8216_priv *priv;
+
+        priv = kzalloc(sizeof(struct ar8216_priv), GFP_KERNEL);
+        if (priv == NULL)
+                return NULL;
+
+        mutex_init(&priv->reg_mutex);
         mutex_init(&priv->mib_lock);
         INIT_DELAYED_WORK(&priv->mib_work, ar8xxx_mib_work_func);
 
-        return 0;
-}
-
-static void
-ar8xxx_mib_start(struct ar8216_priv *priv)
-{
-        if (!ar8xxx_has_mib_counters(priv))
-                return;
-
-        schedule_delayed_work(&priv->mib_work,
-                              msecs_to_jiffies(AR8XXX_MIB_WORK_DELAY));
-}
-
-static void
-ar8xxx_mib_cleanup(struct ar8216_priv *priv)
-{
-        if (!ar8xxx_has_mib_counters(priv))
-                return;
-
-        cancel_delayed_work(&priv->mib_work);
-        kfree(priv->mib_stats);
+        return priv;
+}
+
+static struct ar8216_priv *
+ar8xxx_create_mii(struct mii_bus *bus)
+{
+        struct ar8216_priv *priv;
+
+        priv = ar8xxx_create();
+        if (priv) {
+                priv->mii_bus = bus;
+                priv->read = ar8216_mii_read;
+                priv->write = ar8216_mii_write;
+        }
+
+        return priv;
 }
 
@@ -1778 +1806 @@
 
         if (!priv) {
-                priv = kzalloc(sizeof(struct ar8216_priv), GFP_KERNEL);
+                priv = ar8xxx_create_mii(pdev->bus);
                 if (priv == NULL)
                         return -ENOMEM;
-
-                priv->mii_bus = pdev->bus;
-                priv->read = ar8216_mii_read;
-                priv->write = ar8216_mii_write;
 
                 ret = ar8216_id_chip(priv);
@@ -1829 +1853 @@
                 return 0;
         }
-
-        mutex_init(&priv->reg_mutex);
 
         pdev->priv = priv;
@@ -2007 +2029 @@
                 return -ENODEV;
 
-        priv = kzalloc(sizeof(struct ar8216_priv), GFP_KERNEL);
+        priv = ar8xxx_create_mii(pdev->bus);
         if (priv == NULL)
                 return -ENOMEM;
 
-        priv->mii_bus = pdev->bus;
-        priv->read = ar8216_mii_read;
-        priv->write = ar8216_mii_write;
         priv->phy = pdev;