USB: remove err() macro from usb core code

[linux-2.6-omap-h63xx.git] / drivers / usb / core / inode.c

diff --git a/drivers/usb/core/inode.c b/drivers/usb/core/inode.c
index db410e92c80da6f9d489ce77fe3942e4b414fc64..94632264dccf253edf9a07e8278f4b33fa28eaad 100644 (file)
--- a/drivers/usb/core/inode.c
+++ b/drivers/usb/core/inode.c
@@ -97,7 +97,7 @@ enum {
        Opt_err,
 };
 
-static match_table_t tokens = {
+static const match_table_t tokens = {
        {Opt_devuid, "devuid=%u"},
        {Opt_devgid, "devgid=%u"},
        {Opt_devmode, "devmode=%o"},
@@ -180,8 +180,8 @@ static int parse_options(struct super_block *s, char *data)
                        listmode = option & S_IRWXUGO;
                        break;
                default:
-                       err("usbfs: unrecognised mount option \"%s\" "
-                           "or missing value\n", p);
+                       printk(KERN_ERR "usbfs: unrecognised mount option "
+                              "\"%s\" or missing value\n", p);
                        return -EINVAL;
                }
        }
@@ -240,7 +240,9 @@ static void update_sb(struct super_block *sb)
                                update_special(bus);
                                break;
                        default:
-                               warn("Unknown node %s mode %x found on remount!\n",bus->d_name.name,bus->d_inode->i_mode);
+                               printk(KERN_WARNING "usbfs: Unknown node %s "
+                                      "mode %x found on remount!\n",
+                                      bus->d_name.name, bus->d_inode->i_mode);
                                break;
                        }
                }
@@ -259,7 +261,7 @@ static int remount(struct super_block *sb, int *flags, char *data)
                return 0;
 
        if (parse_options(sb, data)) {
-               warn("usbfs: mount parameter error:");
+               printk(KERN_WARNING "usbfs: mount parameter error.\n");
                return -EINVAL;
        }
 
@@ -599,7 +601,7 @@ static int create_special_files (void)
        /* create the devices special file */
        retval = simple_pin_fs(&usb_fs_type, &usbfs_mount, &usbfs_mount_count);
        if (retval) {
-               err ("Unable to get usbfs mount");
+               printk(KERN_ERR "Unable to get usbfs mount\n");
                goto exit;
        }
 
@@ -611,7 +613,7 @@ static int create_special_files (void)
                                               NULL, &usbfs_devices_fops,
                                               listuid, listgid);
        if (devices_usbfs_dentry == NULL) {
-               err ("Unable to create devices usbfs file");
+               printk(KERN_ERR "Unable to create devices usbfs file\n");
                retval = -ENODEV;
                goto error_clean_mounts;
        }
@@ -663,7 +665,7 @@ static void usbfs_add_bus(struct usb_bus *bus)
        bus->usbfs_dentry = fs_create_file (name, busmode | S_IFDIR, parent,
                                            bus, NULL, busuid, busgid);
        if (bus->usbfs_dentry == NULL) {
-               err ("error creating usbfs bus entry");
+               printk(KERN_ERR "Error creating usbfs bus entry\n");
                return;
        }
 }
@@ -694,7 +696,7 @@ static void usbfs_add_device(struct usb_device *dev)
                                            &usbdev_file_operations,
                                            devuid, devgid);
        if (dev->usbfs_dentry == NULL) {
-               err ("error creating usbfs device entry");
+               printk(KERN_ERR "Error creating usbfs device entry\n");
                return;
        }