MMC host:

- sdhci-msm: Silence warning about turning function into static
  - sdhci-pci-gli: Fix support for GL975x by enabling MSI interrupt
 -----BEGIN PGP SIGNATURE-----
 
 iQJLBAABCgA1FiEEugLDXPmKSktSkQsV/iaEJXNYjCkFAl5mY00XHHVsZi5oYW5z
 c29uQGxpbmFyby5vcmcACgkQ/iaEJXNYjCk8fhAAjd4NLE+J0I1vN3mb/755n4lx
 Ku87daDDnmFtTs56H8DRwycfrA0WvmsmKCJE4Eg1rNc5k6B05s2QZYMxunlVt1nj
 DVVagmI6AXdk3pkjdf7B9nrIif6UiHvq/a2667v266zCkxZ8fXwzLunLh+3GItUu
 oBxYnZDd86hA0myHRMGFO247ncZbqFXi9bdkg1YuLJosEmRxJ4Ck3RtQflXpaifZ
 OUdkT12W2BvOVLUwxjrHNT709pIzCEugNeuw072JpVpOUe8jL6lcpwzJkM2vSO6G
 5/6U0V2q20Ue44kU3iBLEO5E+auD/8FblQ7b01OKm2tv0PipPgRUaobSQnxRuW/t
 gtWdKwF9sHILiFnp/+qMQ/NcYkGAaAM5IY6XWUFGV+dfubMJ6hw5Db+qazN2z3Kt
 bNVWIPCumufZm4W4wCrKKVGWFw/U966deLkP0/nEPCqfMC45OdzACGkC5Dn0PWQC
 2mj8uMuVZYGQZel8gn+sM+LF0lNTakuSkXzglt/BdUp3YQ2phx1KIaE1BEbYqCmy
 2me8L9Rks9FSk0ZbKi9yaUeXb4a7tUAkEAauj/J0KZbFQPNwpI8b8bIV38mh9Izq
 hlmqI9JAHcWVaaJDOJkWIyezpaENtXJ3UG584OO6uY/qLCzDuSfI5sZ7vFYQDviP
 rCiEedYv/PBmh8zyEJM=
 =+2er
 -----END PGP SIGNATURE-----

Merge tag 'mmc-v5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc

Pull MMC host fixes from Ulf Hansson:

 - sdhci-msm: Silence warning about turning function into static

 - sdhci-pci-gli: Fix support for GL975x by enabling MSI interrupt

* tag 'mmc-v5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  mmc: sdhci-pci-gli: Enable MSI interrupt for GL975x
  mmc: sdhci-msm: Mark sdhci_msm_cqe_disable static

drivers/mmc/host/sdhci-msm.c

@@ -1590,7 +1590,7 @@ static u32 sdhci_msm_cqe_irq(struct sdhci_host *host, u32 intmask)
 	return 0;
 }
 
-void sdhci_msm_cqe_disable(struct mmc_host *mmc, bool recovery)
+static void sdhci_msm_cqe_disable(struct mmc_host *mmc, bool recovery)
 {
 	struct sdhci_host *host = mmc_priv(mmc);
 	unsigned long flags;

drivers/mmc/host/sdhci-pci-gli.c

@@ -262,10 +262,26 @@ static int gl9750_execute_tuning(struct sdhci_host *host, u32 opcode)
 	return 0;
 }
 
+static void gli_pcie_enable_msi(struct sdhci_pci_slot *slot)
+{
+	int ret;
+
+	ret = pci_alloc_irq_vectors(slot->chip->pdev, 1, 1,
+				    PCI_IRQ_MSI | PCI_IRQ_MSIX);
+	if (ret < 0) {
+		pr_warn("%s: enable PCI MSI failed, error=%d\n",
+		       mmc_hostname(slot->host->mmc), ret);
+		return;
+	}
+
+	slot->host->irq = pci_irq_vector(slot->chip->pdev, 0);
+}
+
 static int gli_probe_slot_gl9750(struct sdhci_pci_slot *slot)
 {
 	struct sdhci_host *host = slot->host;
 
+	gli_pcie_enable_msi(slot);
 	slot->host->mmc->caps2 |= MMC_CAP2_NO_SDIO;
 	sdhci_enable_v4_mode(host);
 
@@ -276,6 +292,7 @@ static int gli_probe_slot_gl9755(struct sdhci_pci_slot *slot)
 {
 	struct sdhci_host *host = slot->host;
 
+	gli_pcie_enable_msi(slot);
 	slot->host->mmc->caps2 |= MMC_CAP2_NO_SDIO;
 	sdhci_enable_v4_mode(host);