ARM: OMAP: unwrap strings

[cascardo/linux.git] / arch / arm / mach-omap2 / board-n8x0.c

diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
index 2c5d0ed..807299a 100644 (file)
--- a/arch/arm/mach-omap2/board-n8x0.c
+++ b/arch/arm/mach-omap2/board-n8x0.c
@@ -468,7 +468,6 @@ static struct omap_mmc_platform_data mmc1_data = {
        .cleanup                        = n8x0_mmc_cleanup,
        .shutdown                       = n8x0_mmc_shutdown,
        .max_freq                       = 24000000,
-       .dma_mask                       = 0xffffffff,
        .slots[0] = {
                .wires                  = 4,
                .set_power              = n8x0_mmc_set_power,
@@ -554,8 +553,8 @@ static int n8x0_auto_sleep_regulators(void)
 
        ret = menelaus_set_regulator_sleep(1, val);
        if (ret < 0) {
-               printk(KERN_ERR "Could not set regulators to sleep on "
-                       "menelaus: %u\n", ret);
+               pr_err("Could not set regulators to sleep on menelaus: %u\n",
+                      ret);
                return ret;
        }
        return 0;
@@ -567,8 +566,7 @@ static int n8x0_auto_voltage_scale(void)
 
        ret = menelaus_set_vcore_hw(1400, 1050);
        if (ret < 0) {
-               printk(KERN_ERR "Could not set VCORE voltage on "
-                       "menelaus: %u\n", ret);
+               pr_err("Could not set VCORE voltage on menelaus: %u\n", ret);
                return ret;
        }
        return 0;