projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull cpu-hotplug into release branch
[powerpc.git]
/
drivers
/
mmc
/
sdhci.c
diff --git
a/drivers/mmc/sdhci.c
b/drivers/mmc/sdhci.c
index
8b811d9
..
b005328
100644
(file)
--- a/
drivers/mmc/sdhci.c
+++ b/
drivers/mmc/sdhci.c
@@
-31,12
+31,8
@@
#define BUGMAIL "<sdhci-devel@list.drzeus.cx>"
#define BUGMAIL "<sdhci-devel@list.drzeus.cx>"
-#ifdef CONFIG_MMC_DEBUG
#define DBG(f, x...) \
#define DBG(f, x...) \
- printk(KERN_DEBUG DRIVER_NAME " [%s()]: " f, __func__,## x)
-#else
-#define DBG(f, x...) do { } while (0)
-#endif
+ pr_debug(DRIVER_NAME " [%s()]: " f, __func__,## x)
static const struct pci_device_id pci_ids[] __devinitdata = {
/* handle any SD host controller */
static const struct pci_device_id pci_ids[] __devinitdata = {
/* handle any SD host controller */
@@
-574,10
+570,6
@@
static void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
spin_lock_irqsave(&host->lock, flags);
spin_lock_irqsave(&host->lock, flags);
- DBG("clock %uHz busmode %u powermode %u cs %u Vdd %u width %u\n",
- ios->clock, ios->bus_mode, ios->power_mode, ios->chip_select,
- ios->vdd, ios->bus_width);
-
/*
* Reset the chip on each power off.
* Should clear out any weird states.
/*
* Reset the chip on each power off.
* Should clear out any weird states.