- Fixed multi-line comment
- Fixed quoted string split across lines (4x)
Signed-off-by: Mario Leinweber <marioleinweber@xxxxxx>
---
drivers/mmc/host/sdhci-pci-core.c | 32 +++++++++++++++++++-------------
1 file changed, 19 insertions(+), 13 deletions(-)
diff --git a/drivers/mmc/host/sdhci-pci-core.c b/drivers/mmc/host/sdhci-pci-core.c
index 82c4f05f91d8..8bfd39b73f44 100644
--- a/drivers/mmc/host/sdhci-pci-core.c
+++ b/drivers/mmc/host/sdhci-pci-core.c
@@ -250,9 +250,11 @@ static int ricoh_mmc_probe_slot(struct sdhci_pci_slot *slot)
#ifdef CONFIG_PM_SLEEP
static int ricoh_mmc_resume(struct sdhci_pci_chip *chip)
{
- /* Apply a delay to allow controller to settle */
- /* Otherwise it becomes confused if card state changed
- during suspend */
+ /*
+ * Apply a delay to allow controller to settle
+ * Otherwise it becomes confused if card state changed
+ * during suspend
+ */
msleep(500);
return sdhci_pci_resume_host(chip);
}
@@ -1029,8 +1031,8 @@ static int jmicron_probe(struct sdhci_pci_chip *chip)
if (sd_dev) {
pci_dev_put(sd_dev);
- dev_info(&chip->pdev->dev, "Refusing to bind to "
- "secondary interface.\n");
+ dev_info(&chip->pdev->dev,
+ "Refusing to bind to secondary interface.\n");
return -ENODEV;
}
}
@@ -1211,10 +1213,14 @@ static int syskt_probe_slot(struct sdhci_pci_slot *slot)
u8 board_rev = readb(slot->host->ioaddr + SYSKT_BOARD_REV);
u8 chip_rev = readb(slot->host->ioaddr + SYSKT_CHIP_REV);
- dev_info(&slot->chip->pdev->dev, "SysKonnect CardBus2SDIO, "
- "board rev %d.%d, chip rev %d.%d\n",
- board_rev >> 4, board_rev & 0xf,
- chip_rev >> 4, chip_rev & 0xf);
+
+ dev_info(&slot->chip->pdev->dev,
+ "SysKonnect CardBus2SDIO, board rev %d.%d, chip rev %d.%d\n",
+ board_rev >> 4,
+ board_rev & 0xf,
+ chip_rev >> 4,
+ chip_rev & 0xf);
+
if (chip_rev >= 0x20)
slot->host->quirks |= SDHCI_QUIRK_FORCE_DMA;
@@ -1497,8 +1503,8 @@ int sdhci_pci_enable_dma(struct sdhci_host *host)
if (((pdev->class & 0xFFFF00) == (PCI_CLASS_SYSTEM_SDHCI << 8)) &&
((pdev->class & 0x0000FF) != PCI_SDHCI_IFDMA) &&
(host->flags & SDHCI_USE_SDMA)) {
- dev_warn(&pdev->dev, "Will use DMA mode even though HW "
- "doesn't fully claim to support it.\n");
+ dev_warn(&pdev->dev,
+ "Will use DMA mode even though HW doesn't fully claim to support it.\n");
}
pci_set_master(pdev);
@@ -1631,8 +1637,8 @@ static struct sdhci_pci_slot *sdhci_pci_probe_slot(
}
if (pci_resource_len(pdev, bar) < 0x100) {
- dev_err(&pdev->dev, "Invalid iomem size. You may "
- "experience problems.\n");
+ dev_err(&pdev->dev,
+ "Invalid iomem size. You may experience problems.\n");
}
if ((pdev->class & 0x0000FF) == PCI_SDHCI_IFVENDOR) {
--
2.14.3
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
