hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

USB: remove warn() macro from usb drivers 

USB should not be having it's own printk macros, so remove warn() and
use the system-wide standard of dev_warn() wherever possible.  In the
few places that will not work out, use a basic printk().

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Kroah-Hartman 2008-08-14 09:37:34 -07:00
parent 4dc8994806
commit 3b6004f3b5
9 changed files with 32 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/usb/atm/usbatm.c
View File

@ -344,7 +344,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
__func__, sarb->len, vcc); __func__, sarb->len, vcc);
/* discard cells already received */ /* discard cells already received */
skb_trim(sarb, 0); skb_trim(sarb, 0);
UDSL_ASSERT(sarb->tail + ATM_CELL_PAYLOAD <= sarb->end); UDSL_ASSERT(instance, sarb->tail + ATM_CELL_PAYLOAD <= sarb->end);
} }
memcpy(skb_tail_pointer(sarb), source + ATM_CELL_HEADER, ATM_CELL_PAYLOAD); memcpy(skb_tail_pointer(sarb), source + ATM_CELL_HEADER, ATM_CELL_PAYLOAD);
@ -432,7 +432,7 @@ static void usbatm_extract_cells(struct usbatm_data *instance,
unsigned char *cell_buf = instance->cell_buf; unsigned char *cell_buf = instance->cell_buf;
unsigned int space_left = stride - buf_usage; unsigned int space_left = stride - buf_usage;
UDSL_ASSERT(buf_usage <= stride); UDSL_ASSERT(instance, buf_usage <= stride);
if (avail_data >= space_left) { if (avail_data >= space_left) {
/* add new data and process cell */ /* add new data and process cell */
@ -475,7 +475,7 @@ static unsigned int usbatm_write_cells(struct usbatm_data *instance,
unsigned int stride = instance->tx_channel.stride; unsigned int stride = instance->tx_channel.stride;
vdbg("%s: skb->len=%d, avail_space=%u", __func__, skb->len, avail_space); vdbg("%s: skb->len=%d, avail_space=%u", __func__, skb->len, avail_space);
UDSL_ASSERT(!(avail_space % stride)); UDSL_ASSERT(instance, !(avail_space % stride));
for (bytes_written = 0; bytes_written < avail_space && ctrl->len; for (bytes_written = 0; bytes_written < avail_space && ctrl->len;
bytes_written += stride, target += stride) { bytes_written += stride, target += stride) {
@ -547,7 +547,7 @@ static void usbatm_rx_process(unsigned long data)
if (!urb->iso_frame_desc[i].status) { if (!urb->iso_frame_desc[i].status) {
unsigned int actual_length = urb->iso_frame_desc[i].actual_length; unsigned int actual_length = urb->iso_frame_desc[i].actual_length;
UDSL_ASSERT(actual_length <= packet_size); UDSL_ASSERT(instance, actual_length <= packet_size);
if (!merge_length) if (!merge_length)
merge_start = (unsigned char *)urb->transfer_buffer + urb->iso_frame_desc[i].offset; merge_start = (unsigned char *)urb->transfer_buffer + urb->iso_frame_desc[i].offset;
@ -1188,7 +1188,7 @@ int usbatm_usb_probe(struct usb_interface *intf, const struct usb_device_id *id,
struct urb *urb; struct urb *urb;
unsigned int iso_packets = usb_pipeisoc(channel->endpoint) ? channel->buf_size / channel->packet_size : 0; unsigned int iso_packets = usb_pipeisoc(channel->endpoint) ? channel->buf_size / channel->packet_size : 0;
UDSL_ASSERT(!usb_pipeisoc(channel->endpoint) || usb_pipein(channel->endpoint)); UDSL_ASSERT(instance, !usb_pipeisoc(channel->endpoint) || usb_pipein(channel->endpoint));
urb = usb_alloc_urb(iso_packets, GFP_KERNEL); urb = usb_alloc_urb(iso_packets, GFP_KERNEL);
if (!urb) { if (!urb) {

10
drivers/usb/atm/usbatm.h
View File

@ -40,9 +40,15 @@
*/ */
#ifdef DEBUG #ifdef DEBUG
#define UDSL_ASSERT(x) BUG_ON(!(x)) #define UDSL_ASSERT(instance, x) BUG_ON(!(x))
#else #else
#define UDSL_ASSERT(x) do { if (!(x)) warn("failed assertion '%s' at line %d", __stringify(x), __LINE__); } while(0) #define UDSL_ASSERT(instance, x) \
do { \
if (!(x)) \
dev_warn(&(instance)->usb_intf->dev, \
"failed assertion '%s' at line %d", \
__stringify(x), __LINE__); \
} while(0)
#endif #endif
#define usb_err(instance, format, arg...) \ #define usb_err(instance, format, arg...) \

2
drivers/usb/atm/xusbatm.c
View File

@ -193,7 +193,7 @@ static int __init xusbatm_init(void)
num_vendor != num_product || num_vendor != num_product ||
num_vendor != num_rx_endpoint || num_vendor != num_rx_endpoint ||
num_vendor != num_tx_endpoint) { num_vendor != num_tx_endpoint) {
warn("malformed module parameters"); printk(KERN_WARNING "xusbatm: malformed module parameters\n");
return -EINVAL; return -EINVAL;
} }

3
drivers/usb/core/devio.c
View File

@ -413,7 +413,8 @@ static void driver_disconnect(struct usb_interface *intf)
if (likely(ifnum < 8*sizeof(ps->ifclaimed))) if (likely(ifnum < 8*sizeof(ps->ifclaimed)))
clear_bit(ifnum, &ps->ifclaimed); clear_bit(ifnum, &ps->ifclaimed);
else else
warn("interface number %u out of range", ifnum); dev_warn(&intf->dev, "interface number %u out of range\n",
ifnum);
usb_set_intfdata(intf, NULL); usb_set_intfdata(intf, NULL);

6
drivers/usb/core/inode.c
View File

@ -240,7 +240,9 @@ static void update_sb(struct super_block *sb)
update_special(bus); update_special(bus);
break; break;
default: 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; break;
} }
} }
@ -259,7 +261,7 @@ static int remount(struct super_block *sb, int *flags, char *data)
return 0; return 0;
if (parse_options(sb, data)) { if (parse_options(sb, data)) {
warn("usbfs: mount parameter error:"); printk(KERN_WARNING "usbfs: mount parameter error.\n");
return -EINVAL; return -EINVAL;
} }

3
drivers/usb/core/message.c
View File

@ -1204,7 +1204,8 @@ int usb_set_interface(struct usb_device *dev, int interface, int alternate)
alt = usb_altnum_to_altsetting(iface, alternate); alt = usb_altnum_to_altsetting(iface, alternate);
if (!alt) { if (!alt) {
warn("selecting invalid altsetting %d", alternate); dev_warn(&dev->dev, "selecting invalid altsetting %d",
alternate);
return -EINVAL; return -EINVAL;
} }

8
drivers/usb/image/mdc800.c
View File

@ -361,7 +361,8 @@ static int mdc800_usb_waitForIRQ (int mode, int msec)
if (mdc800->state == NOT_CONNECTED) if (mdc800->state == NOT_CONNECTED)
{ {
warn ("Camera gets disconnected during waiting for irq."); printk(KERN_WARNING "mdc800: Camera gets disconnected "
"during waiting for irq.\n");
mdc800->camera_request_ready=0; mdc800->camera_request_ready=0;
return -2; return -2;
} }
@ -443,7 +444,7 @@ static int mdc800_usb_probe (struct usb_interface *intf,
if (mdc800->dev != NULL) if (mdc800->dev != NULL)
{ {
warn ("only one Mustek MDC800 is supported."); dev_warn(&intf->dev, "only one Mustek MDC800 is supported.\n");
return -ENODEV; return -ENODEV;
} }
@ -701,7 +702,8 @@ static ssize_t mdc800_device_read (struct file *file, char __user *buf, size_t l
} }
if (mdc800->state == WORKING) if (mdc800->state == WORKING)
{ {
warn ("Illegal State \"working\" reached during read ?!"); printk(KERN_WARNING "mdc800: Illegal State \"working\""
"reached during read ?!\n");
mutex_unlock(&mdc800->io_lock); mutex_unlock(&mdc800->io_lock);
return -EBUSY; return -EBUSY;
} }

2
drivers/usb/misc/usblcd.c
View File

@ -311,7 +311,7 @@ static int lcd_probe(struct usb_interface *interface, const struct usb_device_id
dev->interface = interface; dev->interface = interface;
if (le16_to_cpu(dev->udev->descriptor.idProduct) != 0x0001) { if (le16_to_cpu(dev->udev->descriptor.idProduct) != 0x0001) {
warn(KERN_INFO "USBLCD model not supported."); dev_warn(&interface->dev, "USBLCD model not supported.\n");
return -ENODEV; return -ENODEV;
} }

7
drivers/usb/misc/uss720.c
View File

@ -228,11 +228,12 @@ static int get_1284_register(struct parport *pp, unsigned char reg, unsigned cha
ret = rq->urb->status; ret = rq->urb->status;
*val = priv->reg[(reg >= 9) ? 0 : regindex[reg]]; *val = priv->reg[(reg >= 9) ? 0 : regindex[reg]];
if (ret) if (ret)
warn("get_1284_register: usb error %d", ret); printk(KERN_WARNING "get_1284_register: "
"usb error %d\n", ret);
kref_put(&rq->ref_count, destroy_async); kref_put(&rq->ref_count, destroy_async);
return ret; return ret;
} }
warn("get_1284_register timeout"); printk(KERN_WARNING "get_1284_register timeout\n");
kill_all_async_requests_priv(priv); kill_all_async_requests_priv(priv);
return -EIO; return -EIO;
} }
@ -716,7 +717,7 @@ static int uss720_probe(struct usb_interface *intf,
spin_lock_init(&priv->asynclock); spin_lock_init(&priv->asynclock);
INIT_LIST_HEAD(&priv->asynclist); INIT_LIST_HEAD(&priv->asynclist);
if (!(pp = parport_register_port(0, PARPORT_IRQ_NONE, PARPORT_DMA_NONE, &parport_uss720_ops))) { if (!(pp = parport_register_port(0, PARPORT_IRQ_NONE, PARPORT_DMA_NONE, &parport_uss720_ops))) {
warn("could not register parport"); printk(KERN_WARNING "uss720: could not register parport\n");
goto probe_abort; goto probe_abort;
} }