mmc: sdhci-pci: Let devices define how to add the host

ahunter6 · storulf · commit 61c951dedce6 · 2017-04-24T21:41:36.000+02:00
SDHCI provides more flexibility than simply calling sdhci_add_host(). Make
that available by allowing devices to specify their own -&gt;add_host()
function.

Signed-off-by: Adrian Hunter &lt;adrian.hunter@intel.com&gt;
Signed-off-by: Ulf Hansson &lt;ulf.hansson@linaro.org&gt;
Tested-by: Ludovic Desroches &lt;ludovic.desroches@microchip.com&gt;
diff --git a/drivers/mmc/host/sdhci-pci-core.c b/drivers/mmc/host/sdhci-pci-core.c
@@ -1949,7 +1949,10 @@ static struct sdhci_pci_slot *sdhci_pci_probe_slot(
 		}
 	}
 
-	ret = sdhci_add_host(host);
+	if (chip->fixes && chip->fixes->add_host)
+		ret = chip->fixes->add_host(slot);
+	else
+		ret = sdhci_add_host(host);
 	if (ret)
 		goto remove;
 
diff --git a/drivers/mmc/host/sdhci-pci.h b/drivers/mmc/host/sdhci-pci.h
@@ -64,6 +64,7 @@ struct sdhci_pci_fixes {
 	int			(*probe) (struct sdhci_pci_chip *);
 
 	int			(*probe_slot) (struct sdhci_pci_slot *);
+	int			(*add_host) (struct sdhci_pci_slot *);
 	void			(*remove_slot) (struct sdhci_pci_slot *, int);
 
 	int			(*suspend) (struct sdhci_pci_chip *);

Original file line number	Diff line number	Diff line change
`@@ -1949,7 +1949,10 @@ static struct sdhci_pci_slot *sdhci_pci_probe_slot(`
`1949`	`1949`	`}`
`1950`	`1950`	`}`
`1951`	`1951`
`1952`		`- ret = sdhci_add_host(host);`
	`1952`	`+ if (chip->fixes && chip->fixes->add_host)`
	`1953`	`+ ret = chip->fixes->add_host(slot);`
	`1954`	`+ else`
	`1955`	`+ ret = sdhci_add_host(host);`
`1953`	`1956`	`if (ret)`
`1954`	`1957`	`goto remove;`
`1955`	`1958`