diff options
author | David Brownell <david-b@pacbell.net> | 2007-11-19 15:58:36 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-02-01 17:34:51 -0500 |
commit | 00274921a052d3232d9f00856387fb269ac0af11 (patch) | |
tree | 20d2baa7234c936b7451d76f6da527d43197f994 /drivers/usb/gadget/gmidi.c | |
parent | 269954e542328f014fc07fbb0a986192f7a1cced (diff) |
USB: gadget code switches to pr_err() and friends
We now have pr_err(), pr_warning(), and friends ... start using
them in the gadget stack instead of printk(KERN_ERR) and friends.
This gives us shorter lines and somewhat increased readability.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/gadget/gmidi.c')
-rw-r--r-- | drivers/usb/gadget/gmidi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/gadget/gmidi.c b/drivers/usb/gadget/gmidi.c index 7da7fcb05640..5b42ccd0035f 100644 --- a/drivers/usb/gadget/gmidi.c +++ b/drivers/usb/gadget/gmidi.c | |||
@@ -1158,7 +1158,7 @@ static int __devinit gmidi_bind(struct usb_gadget *gadget) | |||
1158 | /* support optional vendor/distro customization */ | 1158 | /* support optional vendor/distro customization */ |
1159 | if (idVendor) { | 1159 | if (idVendor) { |
1160 | if (!idProduct) { | 1160 | if (!idProduct) { |
1161 | printk(KERN_ERR "idVendor needs idProduct!\n"); | 1161 | pr_err("idVendor needs idProduct!\n"); |
1162 | return -ENODEV; | 1162 | return -ENODEV; |
1163 | } | 1163 | } |
1164 | device_desc.idVendor = cpu_to_le16(idVendor); | 1164 | device_desc.idVendor = cpu_to_le16(idVendor); |
@@ -1190,7 +1190,7 @@ static int __devinit gmidi_bind(struct usb_gadget *gadget) | |||
1190 | in_ep = usb_ep_autoconfig(gadget, &bulk_in_desc); | 1190 | in_ep = usb_ep_autoconfig(gadget, &bulk_in_desc); |
1191 | if (!in_ep) { | 1191 | if (!in_ep) { |
1192 | autoconf_fail: | 1192 | autoconf_fail: |
1193 | printk(KERN_ERR "%s: can't autoconfigure on %s\n", | 1193 | pr_err("%s: can't autoconfigure on %s\n", |
1194 | shortname, gadget->name); | 1194 | shortname, gadget->name); |
1195 | return -ENODEV; | 1195 | return -ENODEV; |
1196 | } | 1196 | } |
@@ -1212,7 +1212,7 @@ autoconf_fail: | |||
1212 | * it SHOULD NOT have problems with bulk-capable hardware. | 1212 | * it SHOULD NOT have problems with bulk-capable hardware. |
1213 | * so warn about unrecognized controllers, don't panic. | 1213 | * so warn about unrecognized controllers, don't panic. |
1214 | */ | 1214 | */ |
1215 | printk(KERN_WARNING "%s: controller '%s' not recognized\n", | 1215 | pr_warning("%s: controller '%s' not recognized\n", |
1216 | shortname, gadget->name); | 1216 | shortname, gadget->name); |
1217 | device_desc.bcdDevice = __constant_cpu_to_le16(0x9999); | 1217 | device_desc.bcdDevice = __constant_cpu_to_le16(0x9999); |
1218 | } | 1218 | } |