Merge branch 'i2c/for-mergewindow' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / drivers / i2c / i2c-dev.c

diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
index 77f576e..bce0e8b 100644 (file)
--- a/drivers/i2c/i2c-dev.c
+++ b/drivers/i2c/i2c-dev.c
@@ -14,6 +14,8 @@
 
 /* The I2C_RDWR ioctl code is written by Kolja Waschk <waschk@telos.de> */
 
+#define pr_fmt(fmt)    KBUILD_MODNAME ": " fmt
+
 #include <linux/cdev.h>
 #include <linux/compat.h>
 #include <linux/device.h>
@@ -68,8 +70,7 @@ static struct i2c_dev *get_free_i2c_dev(struct i2c_adapter *adap)
        struct i2c_dev *i2c_dev;
 
        if (adap->nr >= I2C_MINORS) {
-               printk(KERN_ERR "i2c-dev: Out of device minors (%d)\n",
-                      adap->nr);
+               pr_err("Out of device minors (%d)\n", adap->nr);
                return ERR_PTR(-ENODEV);
        }
 
@@ -101,7 +102,7 @@ static ssize_t name_show(struct device *dev,
 
        if (!i2c_dev)
                return -ENODEV;
-       return sprintf(buf, "%s\n", i2c_dev->adap->name);
+       return sysfs_emit(buf, "%s\n", i2c_dev->adap->name);
 }
 static DEVICE_ATTR_RO(name);
 
@@ -145,8 +146,7 @@ static ssize_t i2cdev_read(struct file *file, char __user *buf, size_t count,
        if (tmp == NULL)
                return -ENOMEM;
 
-       pr_debug("i2c-dev: i2c-%d reading %zu bytes.\n",
-               iminor(file_inode(file)), count);
+       pr_debug("i2c-%d reading %zu bytes.\n", iminor(file_inode(file)), count);
 
        ret = i2c_master_recv(client, tmp, count);
        if (ret >= 0)
@@ -170,8 +170,7 @@ static ssize_t i2cdev_write(struct file *file, const char __user *buf,
        if (IS_ERR(tmp))
                return PTR_ERR(tmp);
 
-       pr_debug("i2c-dev: i2c-%d writing %zu bytes.\n",
-               iminor(file_inode(file)), count);
+       pr_debug("i2c-%d writing %zu bytes.\n", iminor(file_inode(file)), count);
 
        ret = i2c_master_send(client, tmp, count);
        kfree(tmp);
@@ -674,8 +673,7 @@ static int i2cdev_attach_adapter(struct device *dev, void *dummy)
                return res;
        }
 
-       pr_debug("i2c-dev: adapter [%s] registered as minor %d\n",
-                adap->name, adap->nr);
+       pr_debug("adapter [%s] registered as minor %d\n", adap->name, adap->nr);
        return 0;
 }
 
@@ -694,7 +692,7 @@ static int i2cdev_detach_adapter(struct device *dev, void *dummy)
 
        put_i2c_dev(i2c_dev, true);
 
-       pr_debug("i2c-dev: adapter [%s] unregistered\n", adap->name);
+       pr_debug("adapter [%s] unregistered\n", adap->name);
        return 0;
 }
 
@@ -727,7 +725,7 @@ static int __init i2c_dev_init(void)
 {
        int res;
 
-       printk(KERN_INFO "i2c /dev entries driver\n");
+       pr_info("i2c /dev entries driver\n");
 
        res = register_chrdev_region(MKDEV(I2C_MAJOR, 0), I2C_MINORS, "i2c");
        if (res)
@@ -755,7 +753,7 @@ out_unreg_class:
 out_unreg_chrdev:
        unregister_chrdev_region(MKDEV(I2C_MAJOR, 0), I2C_MINORS);
 out:
-       printk(KERN_ERR "%s: Driver Initialisation failed\n", __FILE__);
+       pr_err("Driver Initialisation failed\n");
        return res;
 }