From 39e74674a06185d7244ab271c4c9423da8e36889 Mon Sep 17 00:00:00 2001 From: Toshiaki Yamane Date: Thu, 19 Jul 2012 10:08:42 +0900 Subject: [PATCH] --- yaml --- r: 318041 b: refs/heads/master c: a952f947b9ebf83cea406bf69f2847a3ca8a076c h: refs/heads/master i: 318039: 46077a303985fbdf9a16e4d476a68cf29d57848f v: v3 --- [refs] | 2 +- trunk/drivers/staging/frontier/alphatrack.c | 6 +++--- trunk/drivers/staging/frontier/tranzport.c | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 10e54b74195b..0cb0622c08ae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e58b89dade3e9e7577f8481b21af3043dc0fffe3 +refs/heads/master: a952f947b9ebf83cea406bf69f2847a3ca8a076c diff --git a/trunk/drivers/staging/frontier/alphatrack.c b/trunk/drivers/staging/frontier/alphatrack.c index acbb2cc510f9..33085782689e 100644 --- a/trunk/drivers/staging/frontier/alphatrack.c +++ b/trunk/drivers/staging/frontier/alphatrack.c @@ -333,7 +333,7 @@ static int usb_alphatrack_open(struct inode *inode, struct file *file) interface = usb_find_interface(&usb_alphatrack_driver, subminor); if (!interface) { - printk(KERN_ERR "%s - error, can't find device for minor %d\n", + pr_err("%s - error, can't find device for minor %d\n", __func__, subminor); retval = -ENODEV; goto unlock_disconnect_exit; @@ -494,7 +494,7 @@ static ssize_t usb_alphatrack_read(struct file *file, char __user *buffer, /* verify that the device wasn't unplugged */ if (dev->intf == NULL) { retval = -ENODEV; - printk(KERN_ERR "%s: No device or device unplugged %d\n", + pr_err("%s: No device or device unplugged %d\n", __func__, retval); goto unlock_exit; } @@ -565,7 +565,7 @@ static ssize_t usb_alphatrack_write(struct file *file, /* verify that the device wasn't unplugged */ if (dev->intf == NULL) { retval = -ENODEV; - printk(KERN_ERR "%s: No device or device unplugged %d\n", + pr_err("%s: No device or device unplugged %d\n", __func__, retval); goto unlock_exit; } diff --git a/trunk/drivers/staging/frontier/tranzport.c b/trunk/drivers/staging/frontier/tranzport.c index 376706f1c712..5196a4e053e6 100644 --- a/trunk/drivers/staging/frontier/tranzport.c +++ b/trunk/drivers/staging/frontier/tranzport.c @@ -353,8 +353,8 @@ static int usb_tranzport_open(struct inode *inode, struct file *file) interface = usb_find_interface(&usb_tranzport_driver, subminor); if (!interface) { - printk(KERN_ERR "%s - error, can't find device for minor %d\n", - __func__, subminor); + pr_err("%s - error, can't find device for minor %d\n", + __func__, subminor); retval = -ENODEV; goto unlock_disconnect_exit; } @@ -520,8 +520,8 @@ static ssize_t usb_tranzport_read(struct file *file, char __user *buffer, /* verify that the device wasn't unplugged */ if (dev->intf == NULL) { retval = -ENODEV; - printk(KERN_ERR "%s: No device or device unplugged %d\n", - __func__, retval); + pr_err("%s: No device or device unplugged %d\n", + __func__, retval); goto unlock_exit; } @@ -693,8 +693,8 @@ static ssize_t usb_tranzport_write(struct file *file, /* verify that the device wasn't unplugged */ if (dev->intf == NULL) { retval = -ENODEV; - printk(KERN_ERR "%s: No device or device unplugged %d\n", - __func__, retval); + pr_err("%s: No device or device unplugged %d\n", + __func__, retval); goto unlock_exit; }