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

Minor overlapping changes in the btusb and ixgbe drivers.

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

8 files changed, 18 insertions, 30 deletions

diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c
index 74e4364bc9fb..09113b9ad679 100644
--- a/drivers/mmc/core/mmc_ops.c
+++ b/drivers/mmc/core/mmc_ops.c
@@ -564,7 +564,7 @@ int __mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value,
         if (index == EXT_CSD_SANITIZE_START)
                 cmd.sanitize_busy = true;
 
-        err = mmc_wait_for_cmd(host, &cmd, 0);
+        err = mmc_wait_for_cmd(host, &cmd, MMC_CMD_RETRIES);
         if (err)
                 goto out;
 
diff --git a/drivers/mmc/host/bcm2835.c b/drivers/mmc/host/bcm2835.c
index 7e0d3a49c06d..bb31e13648d6 100644
--- a/drivers/mmc/host/bcm2835.c
+++ b/drivers/mmc/host/bcm2835.c
@@ -597,7 +597,7 @@ static void bcm2835_finish_request(struct bcm2835_host *host)
         struct dma_chan *terminate_chan = NULL;
         struct mmc_request *mrq;
 
-        cancel_delayed_work_sync(&host->timeout_work);
+        cancel_delayed_work(&host->timeout_work);
 
         mrq = host->mrq;
 
diff --git a/drivers/mmc/host/renesas_sdhi_core.c b/drivers/mmc/host/renesas_sdhi_core.c
index 64d3b5fb7fe5..4a2872f49a60 100644
--- a/drivers/mmc/host/renesas_sdhi_core.c
+++ b/drivers/mmc/host/renesas_sdhi_core.c
@@ -774,8 +774,6 @@ int renesas_sdhi_probe(struct platform_device *pdev,
         /* All SDHI have SDIO status bits which must be 1 */
         mmc_data->flags |= TMIO_MMC_SDIO_STATUS_SETBITS;
 
-        pm_runtime_enable(&pdev->dev);
-
         ret = renesas_sdhi_clk_enable(host);
         if (ret)
                 goto efree;
@@ -856,8 +854,6 @@ edisclk:
 efree:
         tmio_mmc_host_free(host);
 
-        pm_runtime_disable(&pdev->dev);
-
         return ret;
 }
 EXPORT_SYMBOL_GPL(renesas_sdhi_probe);
@@ -869,8 +865,6 @@ int renesas_sdhi_remove(struct platform_device *pdev)
         tmio_mmc_host_remove(host);
         renesas_sdhi_clk_disable(host);
 
-        pm_runtime_disable(&pdev->dev);
-
         return 0;
 }
 EXPORT_SYMBOL_GPL(renesas_sdhi_remove);
diff --git a/drivers/mmc/host/sdhci-pci-o2micro.c b/drivers/mmc/host/sdhci-pci-o2micro.c
index 9dc4548271b4..19944b0049db 100644
--- a/drivers/mmc/host/sdhci-pci-o2micro.c
+++ b/drivers/mmc/host/sdhci-pci-o2micro.c
@@ -432,7 +432,6 @@ int sdhci_pci_o2_probe_slot(struct sdhci_pci_slot *slot)
                                         mmc_hostname(host->mmc));
                                 host->flags &= ~SDHCI_SIGNALING_330;
                                 host->flags |= SDHCI_SIGNALING_180;
-                                host->quirks2 |= SDHCI_QUIRK2_CLEAR_TRANSFERMODE_REG_BEFORE_CMD;
                                 host->mmc->caps2 |= MMC_CAP2_NO_SD;
                                 host->mmc->caps2 |= MMC_CAP2_NO_SDIO;
                                 pci_write_config_dword(chip->pdev,
@@ -682,6 +681,7 @@ static const struct sdhci_ops sdhci_pci_o2_ops = {
 const struct sdhci_pci_fixes sdhci_o2 = {
         .probe = sdhci_pci_o2_probe,
         .quirks = SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC,
+        .quirks2 = SDHCI_QUIRK2_CLEAR_TRANSFERMODE_REG_BEFORE_CMD,
         .probe_slot = sdhci_pci_o2_probe_slot,
 #ifdef CONFIG_PM_SLEEP
         .resume = sdhci_pci_o2_resume,
diff --git a/drivers/mmc/host/tmio_mmc.c b/drivers/mmc/host/tmio_mmc.c
index 8539e10784b4..93e83ad25976 100644
--- a/drivers/mmc/host/tmio_mmc.c
+++ b/drivers/mmc/host/tmio_mmc.c
@@ -172,8 +172,6 @@ static int tmio_mmc_probe(struct platform_device *pdev)
         host->mmc->f_max = pdata->hclk;
         host->mmc->f_min = pdata->hclk / 512;
 
-        pm_runtime_enable(&pdev->dev);
-
         ret = tmio_mmc_host_probe(host);
         if (ret)
                 goto host_free;
@@ -193,7 +191,6 @@ host_remove:
         tmio_mmc_host_remove(host);
 host_free:
         tmio_mmc_host_free(host);
-        pm_runtime_disable(&pdev->dev);
 cell_disable:
         if (cell->disable)
                 cell->disable(pdev);
@@ -210,8 +207,6 @@ static int tmio_mmc_remove(struct platform_device *pdev)
         if (cell->disable)
                 cell->disable(pdev);
 
-        pm_runtime_disable(&pdev->dev);
-
         return 0;
 }
 
diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h
index c5ba13fae399..2f0b092d6dcc 100644
--- a/drivers/mmc/host/tmio_mmc.h
+++ b/drivers/mmc/host/tmio_mmc.h
@@ -163,6 +163,7 @@ struct tmio_mmc_host {
         unsigned long           last_req_ts;
         struct mutex            ios_lock;       /* protect set_ios() context */
         bool                    native_hotplug;
+        bool                    runtime_synced;
         bool                    sdio_irq_enabled;
 
         /* Mandatory callback */
diff --git a/drivers/mmc/host/tmio_mmc_core.c b/drivers/mmc/host/tmio_mmc_core.c
index 2cb3f951c3e2..9b6e1001e77c 100644
--- a/drivers/mmc/host/tmio_mmc_core.c
+++ b/drivers/mmc/host/tmio_mmc_core.c
@@ -1153,15 +1153,6 @@ void tmio_mmc_host_free(struct tmio_mmc_host *host)
 }
 EXPORT_SYMBOL_GPL(tmio_mmc_host_free);
 
-/**
- * tmio_mmc_host_probe() - Common probe for all implementations
- * @_host: Host to probe
- *
- * Perform tasks common to all implementations probe functions.
- *
- * The caller should have called pm_runtime_enable() prior to calling
- * the common probe function.
- */
 int tmio_mmc_host_probe(struct tmio_mmc_host *_host)
 {
         struct platform_device *pdev = _host->pdev;
@@ -1257,19 +1248,22 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host)
         /* See if we also get DMA */
         tmio_mmc_request_dma(_host, pdata);
 
-        pm_runtime_set_active(&pdev->dev);
         pm_runtime_set_autosuspend_delay(&pdev->dev, 50);
         pm_runtime_use_autosuspend(&pdev->dev);
+        pm_runtime_enable(&pdev->dev);
+        pm_runtime_get_sync(&pdev->dev);
 
         ret = mmc_add_host(mmc);
         if (ret)
                 goto remove_host;
 
         dev_pm_qos_expose_latency_limit(&pdev->dev, 100);
+        pm_runtime_put(&pdev->dev);
 
         return 0;
 
 remove_host:
+        pm_runtime_put_noidle(&pdev->dev);
         tmio_mmc_host_remove(_host);
         return ret;
 }
@@ -1280,12 +1274,11 @@ void tmio_mmc_host_remove(struct tmio_mmc_host *host)
         struct platform_device *pdev = host->pdev;
         struct mmc_host *mmc = host->mmc;
 
+        pm_runtime_get_sync(&pdev->dev);
+
         if (host->pdata->flags & TMIO_MMC_SDIO_IRQ)
                 sd_ctrl_write16(host, CTL_TRANSACTION_CTL, 0x0000);
 
-        if (!host->native_hotplug)
-                pm_runtime_get_sync(&pdev->dev);
-
         dev_pm_qos_hide_latency_limit(&pdev->dev);
 
         mmc_remove_host(mmc);
@@ -1294,7 +1287,10 @@ void tmio_mmc_host_remove(struct tmio_mmc_host *host)
         tmio_mmc_release_dma(host);
 
         pm_runtime_dont_use_autosuspend(&pdev->dev);
+        if (host->native_hotplug)
+                pm_runtime_put_noidle(&pdev->dev);
         pm_runtime_put_sync(&pdev->dev);
+        pm_runtime_disable(&pdev->dev);
 }
 EXPORT_SYMBOL_GPL(tmio_mmc_host_remove);
 
@@ -1337,6 +1333,11 @@ int tmio_mmc_host_runtime_resume(struct device *dev)
 {
         struct tmio_mmc_host *host = dev_get_drvdata(dev);
 
+        if (!host->runtime_synced) {
+                host->runtime_synced = true;
+                return 0;
+        }
+
         tmio_mmc_clk_enable(host);
         tmio_mmc_hw_reset(host->mmc);
 
diff --git a/drivers/mmc/host/uniphier-sd.c b/drivers/mmc/host/uniphier-sd.c
index 49aad9a79c18..91a2be41edf6 100644
--- a/drivers/mmc/host/uniphier-sd.c
+++ b/drivers/mmc/host/uniphier-sd.c
@@ -631,7 +631,6 @@ static int uniphier_sd_probe(struct platform_device *pdev)
         host->clk_disable = uniphier_sd_clk_disable;
         host->set_clock = uniphier_sd_set_clock;
 
-        pm_runtime_enable(&pdev->dev);
         ret = uniphier_sd_clk_enable(host);
         if (ret)
                 goto free_host;
@@ -653,7 +652,6 @@ static int uniphier_sd_probe(struct platform_device *pdev)
 
 free_host:
         tmio_mmc_host_free(host);
-        pm_runtime_disable(&pdev->dev);
 
         return ret;
 }
@@ -664,7 +662,6 @@ static int uniphier_sd_remove(struct platform_device *pdev)
 
         tmio_mmc_host_remove(host);
         uniphier_sd_clk_disable(host);
-        pm_runtime_disable(&pdev->dev);
 
         return 0;
 }