Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
	drivers/net/caif/caif_hsi.c
	drivers/net/usb/qmi_wwan.c

The qmi_wwan merge was trivial.

The caif_hsi.c, on the other hand, was not.  It's a conflict between
1c385f1fdf6f9c66d982802cd74349c040980b50 ("caif-hsi: Replace platform
device with ops structure.") in the net-next tree and commit
39abbaef19cd0a30be93794aa4773c779c3eb1f3 ("caif-hsi: Postpone init of
HIS until open()") in the net tree.

I did my best with that one and will ask Sjur to check it out.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 47 insertions, 29 deletions

diff --git a/drivers/net/caif/caif_hsi.c b/drivers/net/caif/caif_hsi.c
index 1c2bd01e1592..087eb83454c0 100644
--- a/drivers/net/caif/caif_hsi.c
+++ b/drivers/net/caif/caif_hsi.c
@@ -678,8 +678,6 @@ static void cfhsi_rx_done(struct cfhsi *cfhsi)
                          */
                         memcpy(rx_buf, (u8 *)piggy_desc,
                                         CFHSI_DESC_SHORT_SZ);
-                        /* Mark no embedded frame here */
-                        piggy_desc->offset = 0;
                 }
         }
 
@@ -720,6 +718,8 @@ static void cfhsi_rx_done(struct cfhsi *cfhsi)
                         /* Extract any payload in piggyback descriptor. */
                         if (cfhsi_rx_desc(piggy_desc, cfhsi) < 0)
                                 goto out_of_sync;
+                        /* Mark no embedded frame after extracting it */
+                        piggy_desc->offset = 0;
                 }
         }
 
@@ -1131,7 +1131,51 @@ static void cfhsi_setup(struct net_device *dev)
         cfhsi->cfdev.use_stx = false;
         cfhsi->cfdev.use_fcs = false;
         cfhsi->ndev = dev;
-        cfhsi->cfg = hsi_default_config;
+}
+
+int cfhsi_probe(struct platform_device *pdev)
+{
+        struct cfhsi_ops *(*get_ops)(void);
+        struct cfhsi *cfhsi = NULL;
+        struct net_device *ndev;
+        int res;
+
+        ndev = alloc_netdev(sizeof(struct cfhsi), "cfhsi%d", cfhsi_setup);
+        if (!ndev)
+                return -ENODEV;
+
+        cfhsi = netdev_priv(ndev);
+        cfhsi->ndev = ndev;
+        cfhsi->pdev = pdev;
+
+        get_ops = symbol_get(cfhsi_get_ops);
+        if (!get_ops) {
+                pr_err("%s: failed to get the cfhsi_ops\n", __func__);
+                return -ENODEV;
+        }
+
+        /* Assign the HSI device. */
+        cfhsi->ops = (*get_ops)();
+        if (!cfhsi->ops) {
+                pr_err("%s: failed to get the cfhsi_ops\n", __func__);
+                goto err;
+        }
+
+        /* Assign the driver to this HSI device. */
+        cfhsi->ops->cb_ops = &cfhsi->cb_ops;
+        res = register_netdevice(ndev);
+        if (res) {
+                dev_err(&ndev->dev, "%s: Registration error: %d.\n",
+                        __func__, res);
+                free_netdev(ndev);
+        }
+        /* Add CAIF HSI device to list. */
+        list_add_tail(&cfhsi->list, &cfhsi_list);
+
+        return res;
+err:
+        symbol_put(cfhsi_get_ops);
+        return -ENODEV;
 }
 
 static int cfhsi_open(struct net_device *ndev)
@@ -1410,7 +1454,6 @@ static int caif_hsi_newlink(struct net *src_net, struct net_device *dev,
                           struct nlattr *tb[], struct nlattr *data[])
 {
         struct cfhsi *cfhsi = NULL;
-        struct cfhsi_ops *(*get_ops)(void);
 
         ASSERT_RTNL();
 
@@ -1418,32 +1461,7 @@ static int caif_hsi_newlink(struct net *src_net, struct net_device *dev,
         cfhsi_netlink_parms(data, cfhsi);
         dev_net_set(cfhsi->ndev, src_net);
 
-        get_ops = symbol_get(cfhsi_get_ops);
-        if (!get_ops) {
-                pr_err("%s: failed to get the cfhsi_ops\n", __func__);
-                return -ENODEV;
-        }
-
-        /* Assign the HSI device. */
-        cfhsi->ops = (*get_ops)();
-        if (!cfhsi->ops) {
-                pr_err("%s: failed to get the cfhsi_ops\n", __func__);
-                goto err;
-        }
-
-        /* Assign the driver to this HSI device. */
-        cfhsi->ops->cb_ops = &cfhsi->cb_ops;
-        if (register_netdevice(dev)) {
-                pr_warn("%s: caif_hsi device registration failed\n", __func__);
-                goto err;
-        }
-        /* Add CAIF HSI device to list. */
-        list_add_tail(&cfhsi->list, &cfhsi_list);
-
         return 0;
-err:
-        symbol_put(cfhsi_get_ops);
-        return -ENODEV;
 }
 
 static struct rtnl_link_ops caif_hsi_link_ops __read_mostly = {