aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mmc/host/sdhci.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 2b4a86c55a94..b397121b947d 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -25,8 +25,6 @@
25#define DBG(f, x...) \ 25#define DBG(f, x...) \
26 pr_debug(DRIVER_NAME " [%s()]: " f, __func__,## x) 26 pr_debug(DRIVER_NAME " [%s()]: " f, __func__,## x)
27 27
28static unsigned int debug_nodma = 0;
29static unsigned int debug_forcedma = 0;
30static unsigned int debug_quirks = 0; 28static unsigned int debug_quirks = 0;
31 29
32#define SDHCI_QUIRK_CLOCK_BEFORE_RESET (1<<0) 30#define SDHCI_QUIRK_CLOCK_BEFORE_RESET (1<<0)
@@ -1295,12 +1293,7 @@ static int __devinit sdhci_probe_slot(struct pci_dev *pdev, int slot)
1295 1293
1296 caps = readl(host->ioaddr + SDHCI_CAPABILITIES); 1294 caps = readl(host->ioaddr + SDHCI_CAPABILITIES);
1297 1295
1298 if (debug_nodma) 1296 if (chip->quirks & SDHCI_QUIRK_FORCE_DMA)
1299 DBG("DMA forced off\n");
1300 else if (debug_forcedma) {
1301 DBG("DMA forced on\n");
1302 host->flags |= SDHCI_USE_DMA;
1303 } else if (chip->quirks & SDHCI_QUIRK_FORCE_DMA)
1304 host->flags |= SDHCI_USE_DMA; 1297 host->flags |= SDHCI_USE_DMA;
1305 else if (!(caps & SDHCI_CAN_DO_DMA)) 1298 else if (!(caps & SDHCI_CAN_DO_DMA))
1306 DBG("Controller doesn't have DMA capability\n"); 1299 DBG("Controller doesn't have DMA capability\n");
@@ -1613,14 +1606,10 @@ static void __exit sdhci_drv_exit(void)
1613module_init(sdhci_drv_init); 1606module_init(sdhci_drv_init);
1614module_exit(sdhci_drv_exit); 1607module_exit(sdhci_drv_exit);
1615 1608
1616module_param(debug_nodma, uint, 0444);
1617module_param(debug_forcedma, uint, 0444);
1618module_param(debug_quirks, uint, 0444); 1609module_param(debug_quirks, uint, 0444);
1619 1610
1620MODULE_AUTHOR("Pierre Ossman <drzeus@drzeus.cx>"); 1611MODULE_AUTHOR("Pierre Ossman <drzeus@drzeus.cx>");
1621MODULE_DESCRIPTION("Secure Digital Host Controller Interface driver"); 1612MODULE_DESCRIPTION("Secure Digital Host Controller Interface driver");
1622MODULE_LICENSE("GPL"); 1613MODULE_LICENSE("GPL");
1623 1614
1624MODULE_PARM_DESC(debug_nodma, "Forcefully disable DMA transfers. (default 0)");
1625MODULE_PARM_DESC(debug_forcedma, "Forcefully enable DMA transfers. (default 0)");
1626MODULE_PARM_DESC(debug_quirks, "Force certain quirks."); 1615MODULE_PARM_DESC(debug_quirks, "Force certain quirks.");