]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
mfd: Convert remaining uses of pr_warning to pr_warn
authorJoe Perches <joe@perches.com>
Fri, 17 Feb 2017 07:11:36 +0000 (23:11 -0800)
committerLee Jones <lee.jones@linaro.org>
Thu, 27 Apr 2017 08:25:05 +0000 (09:25 +0100)
To enable eventual removal of pr_warning

This makes pr_warn use consistent for drivers/mfd

Prior to this patch, there were 4 uses of pr_warning and
9 uses of pr_warn in drivers/mfd

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
drivers/mfd/db8500-prcmu.c
drivers/mfd/sta2x11-mfd.c
drivers/mfd/twl4030-power.c

index ca38a6a141100ef1e2b2042d68e7488c69855678..5c739ac752e820fc2b652649bcfe7384a202e749 100644 (file)
@@ -2377,7 +2377,7 @@ static void ack_dbb_wakeup(void)
 
 static inline void print_unknown_header_warning(u8 n, u8 header)
 {
-       pr_warning("prcmu: Unknown message header (%d) in mailbox %d.\n",
+       pr_warn("prcmu: Unknown message header (%d) in mailbox %d\n",
                header, n);
 }
 
index 9292202039ee9bac5a77493fbc9c7f33af8c2859..3aeafa228bafa68e628ebff16b90b8b8c15e6c8a 100644 (file)
@@ -60,8 +60,8 @@ static struct sta2x11_mfd *sta2x11_mfd_find(struct pci_dev *pdev)
        struct sta2x11_mfd *mfd;
 
        if (!pdev && !list_empty(&sta2x11_mfd_list)) {
-               pr_warning("%s: Unspecified device, "
-                           "using first instance\n", __func__);
+               pr_warn("%s: Unspecified device, using first instance\n",
+                       __func__);
                return list_entry(sta2x11_mfd_list.next,
                                  struct sta2x11_mfd, list);
        }
index e1e69a480c5620856e45f841890e32520af53bda..f4b2c29d77e3302adc1451657179a2b8916bcdb9 100644 (file)
@@ -502,9 +502,7 @@ static int load_twl4030_script(const struct twl4030_power_data *pdata,
        }
        if (tscript->flags & TWL4030_SLEEP_SCRIPT) {
                if (!order)
-                       pr_warning("TWL4030: Bad order of scripts (sleep "\
-                                       "script before wakeup) Leads to boot"\
-                                       "failure on some boards\n");
+                       pr_warn("TWL4030: Bad order of scripts (sleep script before wakeup) Leads to boot failure on some boards\n");
                err = twl4030_config_sleep_sequence(address);
        }
 out:
@@ -930,8 +928,7 @@ static int twl4030_power_probe(struct platform_device *pdev)
                err = twl_i2c_read_u8(TWL_MODULE_PM_MASTER, &val,
                                      TWL4030_PM_MASTER_CFG_P123_TRANSITION);
                if (err) {
-                       pr_warning("TWL4030 Unable to read registers\n");
-
+                       pr_warn("TWL4030 Unable to read registers\n");
                } else if (!(val & SEQ_OFFSYNC)) {
                        val |= SEQ_OFFSYNC;
                        err = twl_i2c_write_u8(TWL_MODULE_PM_MASTER, val,