pps: simplify conditions a bit

[firefly-linux-kernel-4.4.55.git] / drivers / hwmon / dme1737.c

diff --git a/drivers/hwmon/dme1737.c b/drivers/hwmon/dme1737.c
index 980c17d5eeae98992345f2a2f413994f3513c79f..e9a610bfd0cc894db71e7203e11d783a34157c46 100644 (file)
--- a/drivers/hwmon/dme1737.c
+++ b/drivers/hwmon/dme1737.c
@@ -25,6 +25,8 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
@@ -2446,7 +2448,7 @@ static int __init dme1737_isa_detect(int sio_cip, unsigned short *addr)
        /* Get the base address of the runtime registers */
        if (!(base_addr = (dme1737_sio_inb(sio_cip, 0x60) << 8) |
                           dme1737_sio_inb(sio_cip, 0x61))) {
-               printk(KERN_ERR "dme1737: Base address not set.\n");
+               pr_err("Base address not set\n");
                err = -ENODEV;
                goto exit;
        }
@@ -2475,20 +2477,18 @@ static int __init dme1737_isa_device_add(unsigned short addr)
                goto exit;
 
        if (!(pdev = platform_device_alloc("dme1737", addr))) {
-               printk(KERN_ERR "dme1737: Failed to allocate device.\n");
+               pr_err("Failed to allocate device\n");
                err = -ENOMEM;
                goto exit;
        }
 
        if ((err = platform_device_add_resources(pdev, &res, 1))) {
-               printk(KERN_ERR "dme1737: Failed to add device resource "
-                      "(err = %d).\n", err);
+               pr_err("Failed to add device resource (err = %d)\n", err);
                goto exit_device_put;
        }
 
        if ((err = platform_device_add(pdev))) {
-               printk(KERN_ERR "dme1737: Failed to add device (err = %d).\n",
-                      err);
+               pr_err("Failed to add device (err = %d)\n", err);
                goto exit_device_put;
        }