Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit abdc6fd1 authored by Joe Perches's avatar Joe Perches Committed by Guenter Roeck
Browse files

hwmon: (w83627ehf) Use pr_fmt and pr_<level> 



Added #define pr_fmt KBUILD_MODNAME ": " fmt
Converted printks to pr_<level>
Coalesced any long formats
Removed prefixes from formats

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarGuenter Roeck <guenter.roeck@ericsson.com>
parent 9d72be0d

drivers/hwmon/w83627ehf.c

+10 −13
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ 
    w83667hg-b   9      5       3       3      0xb350 0xc1    0x5ca3

*/



#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/module.h>

#include <linux/init.h>

#include <linux/slab.h>
@@ -1668,8 +1670,7 @@ static int __init w83627ehf_find(int sioaddr, unsigned short *addr, 
		break;

	default:

		if (val != 0xffff)

			pr_debug(DRVNAME ": unsupported chip ID: 0x%04x\n",

				 val);

			pr_debug("unsupported chip ID: 0x%04x\n", val);

		superio_exit(sioaddr);

		return -ENODEV;

	}
@@ -1680,8 +1681,7 @@ static int __init w83627ehf_find(int sioaddr, unsigned short *addr, 
	    | superio_inb(sioaddr, SIO_REG_ADDR + 1);

	*addr = val & IOREGION_ALIGNMENT;

	if (*addr == 0) {

		printk(KERN_ERR DRVNAME ": Refusing to enable a Super-I/O "

		       "device with a base I/O port 0.\n");

		pr_err("Refusing to enable a Super-I/O device with a base I/O port 0\n");

		superio_exit(sioaddr);

		return -ENODEV;

	}
@@ -1689,13 +1689,12 @@ static int __init w83627ehf_find(int sioaddr, unsigned short *addr, 
	/* Activate logical device if needed */

	val = superio_inb(sioaddr, SIO_REG_ENABLE);

	if (!(val & 0x01)) {

		printk(KERN_WARNING DRVNAME ": Forcibly enabling Super-I/O. "

		       "Sensor is probably unusable.\n");

		pr_warn("Forcibly enabling Super-I/O. Sensor is probably unusable.\n");

		superio_outb(sioaddr, SIO_REG_ENABLE, val | 0x01);

	}



	superio_exit(sioaddr);

	pr_info(DRVNAME ": Found %s chip at %#x\n", sio_name, *addr);

	pr_info("Found %s chip at %#x\n", sio_name, *addr);

	sio_data->sioreg = sioaddr;



	return 0;
@@ -1729,14 +1728,14 @@ static int __init sensors_w83627ehf_init(void) 


	if (!(pdev = platform_device_alloc(DRVNAME, address))) {

		err = -ENOMEM;

		printk(KERN_ERR DRVNAME ": Device allocation failed\n");

		pr_err("Device allocation failed\n");

		goto exit_unregister;

	}



	err = platform_device_add_data(pdev, &sio_data,

				       sizeof(struct w83627ehf_sio_data));

	if (err) {

		printk(KERN_ERR DRVNAME ": Platform data allocation failed\n");

		pr_err("Platform data allocation failed\n");

		goto exit_device_put;

	}
@@ -1752,16 +1751,14 @@ static int __init sensors_w83627ehf_init(void) 


	err = platform_device_add_resources(pdev, &res, 1);

	if (err) {

		printk(KERN_ERR DRVNAME ": Device resource addition failed "

		       "(%d)\n", err);

		pr_err("Device resource addition failed (%d)\n", err);

		goto exit_device_put;

	}



	/* platform_device_add calls probe() */

	err = platform_device_add(pdev);

	if (err) {

		printk(KERN_ERR DRVNAME ": Device addition failed (%d)\n",

		       err);

		pr_err("Device addition failed (%d)\n", err);

		goto exit_device_put;

	}