diff options
| author | Pierre Ossman <drzeus@drzeus.cx> | 2007-09-30 06:47:05 -0400 |
|---|---|---|
| committer | Pierre Ossman <drzeus@drzeus.cx> | 2007-10-03 12:40:49 -0400 |
| commit | d6f8deecefc133cac044f6029bdb349a1cb8753a (patch) | |
| tree | c326d246478490dd41bf2fda176db4e4a31c70de | |
| parent | 7c168e3db7d900008ee304574057e0dc1a8505af (diff) | |
sdhci: remove old dma module params
The forcedma and nodma module parameters can be replaced with the quirks
parameter, so remove the redundancy.
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
| -rw-r--r-- | drivers/mmc/host/sdhci.c | 13 |
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 | ||
| 28 | static unsigned int debug_nodma = 0; | ||
| 29 | static unsigned int debug_forcedma = 0; | ||
| 30 | static unsigned int debug_quirks = 0; | 28 | static 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) | |||
| 1613 | module_init(sdhci_drv_init); | 1606 | module_init(sdhci_drv_init); |
| 1614 | module_exit(sdhci_drv_exit); | 1607 | module_exit(sdhci_drv_exit); |
| 1615 | 1608 | ||
| 1616 | module_param(debug_nodma, uint, 0444); | ||
| 1617 | module_param(debug_forcedma, uint, 0444); | ||
| 1618 | module_param(debug_quirks, uint, 0444); | 1609 | module_param(debug_quirks, uint, 0444); |
| 1619 | 1610 | ||
| 1620 | MODULE_AUTHOR("Pierre Ossman <drzeus@drzeus.cx>"); | 1611 | MODULE_AUTHOR("Pierre Ossman <drzeus@drzeus.cx>"); |
| 1621 | MODULE_DESCRIPTION("Secure Digital Host Controller Interface driver"); | 1612 | MODULE_DESCRIPTION("Secure Digital Host Controller Interface driver"); |
| 1622 | MODULE_LICENSE("GPL"); | 1613 | MODULE_LICENSE("GPL"); |
| 1623 | 1614 | ||
| 1624 | MODULE_PARM_DESC(debug_nodma, "Forcefully disable DMA transfers. (default 0)"); | ||
| 1625 | MODULE_PARM_DESC(debug_forcedma, "Forcefully enable DMA transfers. (default 0)"); | ||
| 1626 | MODULE_PARM_DESC(debug_quirks, "Force certain quirks."); | 1615 | MODULE_PARM_DESC(debug_quirks, "Force certain quirks."); |
