|
@@ -26,6 +26,8 @@
|
|
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
*/
|
|
*/
|
|
|
|
|
|
|
|
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
|
|
|
+
|
|
#include <linux/module.h>
|
|
#include <linux/module.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/ioport.h>
|
|
#include <linux/ioport.h>
|
|
@@ -311,21 +313,19 @@ static int __init smsc47b397_device_add(unsigned short address)
|
|
pdev = platform_device_alloc(DRVNAME, address);
|
|
pdev = platform_device_alloc(DRVNAME, address);
|
|
if (!pdev) {
|
|
if (!pdev) {
|
|
err = -ENOMEM;
|
|
err = -ENOMEM;
|
|
- printk(KERN_ERR DRVNAME ": Device allocation failed\n");
|
|
|
|
|
|
+ pr_err("Device allocation failed\n");
|
|
goto exit;
|
|
goto exit;
|
|
}
|
|
}
|
|
|
|
|
|
err = platform_device_add_resources(pdev, &res, 1);
|
|
err = platform_device_add_resources(pdev, &res, 1);
|
|
if (err) {
|
|
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;
|
|
goto exit_device_put;
|
|
}
|
|
}
|
|
|
|
|
|
err = platform_device_add(pdev);
|
|
err = platform_device_add(pdev);
|
|
if (err) {
|
|
if (err) {
|
|
- printk(KERN_ERR DRVNAME ": Device addition failed (%d)\n",
|
|
|
|
- err);
|
|
|
|
|
|
+ pr_err("Device addition failed (%d)\n", err);
|
|
goto exit_device_put;
|
|
goto exit_device_put;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -367,8 +367,7 @@ static int __init smsc47b397_find(unsigned short *addr)
|
|
*addr = (superio_inb(SUPERIO_REG_BASE_MSB) << 8)
|
|
*addr = (superio_inb(SUPERIO_REG_BASE_MSB) << 8)
|
|
| superio_inb(SUPERIO_REG_BASE_LSB);
|
|
| superio_inb(SUPERIO_REG_BASE_LSB);
|
|
|
|
|
|
- printk(KERN_INFO DRVNAME ": found SMSC %s "
|
|
|
|
- "(base address 0x%04x, revision %u)\n",
|
|
|
|
|
|
+ pr_info("found SMSC %s (base address 0x%04x, revision %u)\n",
|
|
name, *addr, rev);
|
|
name, *addr, rev);
|
|
|
|
|
|
superio_exit();
|
|
superio_exit();
|