|
@@ -22,6 +22,8 @@
|
|
|
* mode, and voltages aren't supported at all.
|
|
|
*/
|
|
|
|
|
|
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
|
|
+
|
|
|
#include <linux/module.h>
|
|
|
#include <linux/init.h>
|
|
|
#include <linux/slab.h>
|
|
@@ -1077,7 +1079,7 @@ static int __devinit pc87427_probe(struct platform_device *pdev)
|
|
|
data = kzalloc(sizeof(struct pc87427_data), GFP_KERNEL);
|
|
|
if (!data) {
|
|
|
err = -ENOMEM;
|
|
|
- printk(KERN_ERR DRVNAME ": Out of memory\n");
|
|
|
+ pr_err("Out of memory\n");
|
|
|
goto exit;
|
|
|
}
|
|
|
|
|
@@ -1196,28 +1198,26 @@ static int __init pc87427_device_add(const struct pc87427_sio_data *sio_data)
|
|
|
pdev = platform_device_alloc(DRVNAME, res[0].start);
|
|
|
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, res_count);
|
|
|
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 pc87427_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;
|
|
|
}
|
|
|
|
|
@@ -1249,23 +1249,23 @@ static int __init pc87427_find(int sioaddr, struct pc87427_sio_data *sio_data)
|
|
|
|
|
|
val = superio_inb(sioaddr, SIOREG_ACT);
|
|
|
if (!(val & 0x01)) {
|
|
|
- printk(KERN_INFO DRVNAME ": Logical device 0x%02x "
|
|
|
- "not activated\n", logdev[i]);
|
|
|
+ pr_info("Logical device 0x%02x not activated\n",
|
|
|
+ logdev[i]);
|
|
|
continue;
|
|
|
}
|
|
|
|
|
|
val = superio_inb(sioaddr, SIOREG_MAP);
|
|
|
if (val & 0x01) {
|
|
|
- printk(KERN_WARNING DRVNAME ": Logical device 0x%02x "
|
|
|
- "is memory-mapped, can't use\n", logdev[i]);
|
|
|
+ pr_warn("Logical device 0x%02x is memory-mapped, "
|
|
|
+ "can't use\n", logdev[i]);
|
|
|
continue;
|
|
|
}
|
|
|
|
|
|
val = (superio_inb(sioaddr, SIOREG_IOBASE) << 8)
|
|
|
| superio_inb(sioaddr, SIOREG_IOBASE + 1);
|
|
|
if (!val) {
|
|
|
- printk(KERN_INFO DRVNAME ": I/O base address not set "
|
|
|
- "for logical device 0x%02x\n", logdev[i]);
|
|
|
+ pr_info("I/O base address not set for logical device "
|
|
|
+ "0x%02x\n", logdev[i]);
|
|
|
continue;
|
|
|
}
|
|
|
sio_data->address[i] = val;
|