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

Conflicts:
	drivers/net/ethernet/mellanox/mlx5/core/en.h
	drivers/net/ethernet/mellanox/mlx5/core/en_main.c
	drivers/net/usb/r8152.c

All three conflicts were overlapping changes.

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

6 files changed, 15 insertions, 26 deletions

diff --git a/drivers/phy/phy-bcm-ns-usb2.c b/drivers/phy/phy-bcm-ns-usb2.c
index 95ab6b2a0de5..58dff80e9386 100644
--- a/drivers/phy/phy-bcm-ns-usb2.c
+++ b/drivers/phy/phy-bcm-ns-usb2.c
@@ -109,8 +109,8 @@ static int bcm_ns_usb2_probe(struct platform_device *pdev)
         }
 
         usb2->phy = devm_phy_create(dev, NULL, &ops);
-        if (IS_ERR(dev))
-                return PTR_ERR(dev);
+        if (IS_ERR(usb2->phy))
+                return PTR_ERR(usb2->phy);
 
         phy_set_drvdata(usb2->phy, usb2);
         platform_set_drvdata(pdev, usb2);
diff --git a/drivers/phy/phy-miphy28lp.c b/drivers/phy/phy-miphy28lp.c
index 3acd2a1808df..213e2e15339c 100644
--- a/drivers/phy/phy-miphy28lp.c
+++ b/drivers/phy/phy-miphy28lp.c
@@ -1143,7 +1143,8 @@ static int miphy28lp_probe_resets(struct device_node *node,
         struct miphy28lp_dev *miphy_dev = miphy_phy->phydev;
         int err;
 
-        miphy_phy->miphy_rst = of_reset_control_get(node, "miphy-sw-rst");
+        miphy_phy->miphy_rst =
+                of_reset_control_get_shared(node, "miphy-sw-rst");
 
         if (IS_ERR(miphy_phy->miphy_rst)) {
                 dev_err(miphy_dev->dev,
diff --git a/drivers/phy/phy-rcar-gen3-usb2.c b/drivers/phy/phy-rcar-gen3-usb2.c
index 76bb88f0700a..4be3f5dbbc9f 100644
--- a/drivers/phy/phy-rcar-gen3-usb2.c
+++ b/drivers/phy/phy-rcar-gen3-usb2.c
@@ -144,12 +144,6 @@ static void rcar_gen3_init_for_peri(struct rcar_gen3_chan *ch)
         extcon_set_cable_state_(ch->extcon, EXTCON_USB, true);
 }
 
-static bool rcar_gen3_check_vbus(struct rcar_gen3_chan *ch)
-{
-        return !!(readl(ch->base + USB2_ADPCTRL) &
-                  USB2_ADPCTRL_OTGSESSVLD);
-}
-
 static bool rcar_gen3_check_id(struct rcar_gen3_chan *ch)
 {
         return !!(readl(ch->base + USB2_ADPCTRL) & USB2_ADPCTRL_IDDIG);
@@ -157,13 +151,7 @@ static bool rcar_gen3_check_id(struct rcar_gen3_chan *ch)
 
 static void rcar_gen3_device_recognition(struct rcar_gen3_chan *ch)
 {
-        bool is_host = true;
-
-        /* B-device? */
-        if (rcar_gen3_check_id(ch) && rcar_gen3_check_vbus(ch))
-                is_host = false;
-
-        if (is_host)
+        if (!rcar_gen3_check_id(ch))
                 rcar_gen3_init_for_host(ch);
         else
                 rcar_gen3_init_for_peri(ch);
diff --git a/drivers/phy/phy-rockchip-dp.c b/drivers/phy/phy-rockchip-dp.c
index 793ecb6d87bc..8b267a746576 100644
--- a/drivers/phy/phy-rockchip-dp.c
+++ b/drivers/phy/phy-rockchip-dp.c
@@ -90,7 +90,7 @@ static int rockchip_dp_phy_probe(struct platform_device *pdev)
                 return -ENODEV;
 
         dp = devm_kzalloc(dev, sizeof(*dp), GFP_KERNEL);
-        if (IS_ERR(dp))
+        if (!dp)
                 return -ENOMEM;
 
         dp->dev = dev;
diff --git a/drivers/phy/phy-stih407-usb.c b/drivers/phy/phy-stih407-usb.c
index 1d5ae5f8ef69..b1f44ab669fb 100644
--- a/drivers/phy/phy-stih407-usb.c
+++ b/drivers/phy/phy-stih407-usb.c
@@ -105,13 +105,13 @@ static int stih407_usb2_picophy_probe(struct platform_device *pdev)
         phy_dev->dev = dev;
         dev_set_drvdata(dev, phy_dev);
 
-        phy_dev->rstc = devm_reset_control_get(dev, "global");
+        phy_dev->rstc = devm_reset_control_get_shared(dev, "global");
         if (IS_ERR(phy_dev->rstc)) {
                 dev_err(dev, "failed to ctrl picoPHY reset\n");
                 return PTR_ERR(phy_dev->rstc);
         }
 
-        phy_dev->rstport = devm_reset_control_get(dev, "port");
+        phy_dev->rstport = devm_reset_control_get_exclusive(dev, "port");
         if (IS_ERR(phy_dev->rstport)) {
                 dev_err(dev, "failed to ctrl picoPHY reset\n");
                 return PTR_ERR(phy_dev->rstport);
diff --git a/drivers/phy/phy-sun4i-usb.c b/drivers/phy/phy-sun4i-usb.c
index bae54f7a1f48..de3101fbbf40 100644
--- a/drivers/phy/phy-sun4i-usb.c
+++ b/drivers/phy/phy-sun4i-usb.c
@@ -175,7 +175,7 @@ static void sun4i_usb_phy_write(struct sun4i_usb_phy *phy, u32 addr, u32 data,
 {
         struct sun4i_usb_phy_data *phy_data = to_sun4i_usb_phy_data(phy);
         u32 temp, usbc_bit = BIT(phy->index * 2);
-        void *phyctl = phy_data->base + phy_data->cfg->phyctl_offset;
+        void __iomem *phyctl = phy_data->base + phy_data->cfg->phyctl_offset;
         int i;
 
         mutex_lock(&phy_data->mutex);
@@ -514,9 +514,9 @@ static int sun4i_usb_phy_remove(struct platform_device *pdev)
 
         if (data->vbus_power_nb_registered)
                 power_supply_unreg_notifier(&data->vbus_power_nb);
-        if (data->id_det_irq >= 0)
+        if (data->id_det_irq > 0)
                 devm_free_irq(dev, data->id_det_irq, data);
-        if (data->vbus_det_irq >= 0)
+        if (data->vbus_det_irq > 0)
                 devm_free_irq(dev, data->vbus_det_irq, data);
 
         cancel_delayed_work_sync(&data->detect);
@@ -645,11 +645,11 @@ static int sun4i_usb_phy_probe(struct platform_device *pdev)
 
         data->id_det_irq = gpiod_to_irq(data->id_det_gpio);
         data->vbus_det_irq = gpiod_to_irq(data->vbus_det_gpio);
-        if ((data->id_det_gpio && data->id_det_irq < 0) ||
-            (data->vbus_det_gpio && data->vbus_det_irq < 0))
+        if ((data->id_det_gpio && data->id_det_irq <= 0) ||
+            (data->vbus_det_gpio && data->vbus_det_irq <= 0))
                 data->phy0_poll = true;
 
-        if (data->id_det_irq >= 0) {
+        if (data->id_det_irq > 0) {
                 ret = devm_request_irq(dev, data->id_det_irq,
                                 sun4i_usb_phy0_id_vbus_det_irq,
                                 IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
@@ -660,7 +660,7 @@ static int sun4i_usb_phy_probe(struct platform_device *pdev)
                 }
         }
 
-        if (data->vbus_det_irq >= 0) {
+        if (data->vbus_det_irq > 0) {
                 ret = devm_request_irq(dev, data->vbus_det_irq,
                                 sun4i_usb_phy0_id_vbus_det_irq,
                                 IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,