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

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

hwmon: (w83627hf) 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 abdc6fd1

drivers/hwmon/w83627hf.c

+8 −9
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@ 
    supported yet.

*/



#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/module.h>

#include <linux/init.h>

#include <linux/slab.h>
@@ -1166,14 +1168,13 @@ static int __init w83627hf_find(int sioaddr, unsigned short *addr, 
	       superio_inb(sio_data, WINB_BASE_REG + 1);

	*addr = val & WINB_ALIGNMENT;

	if (*addr == 0) {

		printk(KERN_WARNING DRVNAME ": Base address not set, "

		       "skipping\n");

		pr_warn("Base address not set, skipping\n");

		goto exit;

	}



	val = superio_inb(sio_data, WINB_ACT_REG);

	if (!(val & 0x01)) {

		printk(KERN_WARNING DRVNAME ": Enabling HWM logical device\n");

		pr_warn("Enabling HWM logical device\n");

		superio_outb(sio_data, WINB_ACT_REG, val | 0x01);

	}
@@ -1789,28 +1790,26 @@ static int __init w83627hf_device_add(unsigned short address, 
	pdev = platform_device_alloc(DRVNAME, address);

	if (!pdev) {

		err = -ENOMEM;

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

		pr_err("Device allocation failed\n");

		goto exit;

	}



	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;

	}



	err = platform_device_add_data(pdev, sio_data,

				       sizeof(struct w83627hf_sio_data));

	if (err) {

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

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

		goto exit_device_put;

	}



	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;

	}