diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-08-19 17:49:10 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-08-19 17:49:10 -0700 |
| commit | 3d2ae7c0b844cad72e48a809384c031491291e54 (patch) | |
| tree | 51bd5613cda3352cbe90a8d0d90679ac1ea8a150 /usb | |
| parent | 374dd724ae3b7fbd7ba830a0de24f3b07fb9ef62 (diff) | |
| download | patches-3d2ae7c0b844cad72e48a809384c031491291e54.tar.gz | |
atm warning fix
Diffstat (limited to 'usb')
| -rw-r--r-- | usb/usb-remove-warn-macro-from-usb.h.patch | 71 |
1 files changed, 70 insertions, 1 deletions
diff --git a/usb/usb-remove-warn-macro-from-usb.h.patch b/usb/usb-remove-warn-macro-from-usb.h.patch index 428928f57827c9..339a6ececad62a 100644 --- a/usb/usb-remove-warn-macro-from-usb.h.patch +++ b/usb/usb-remove-warn-macro-from-usb.h.patch @@ -30,6 +30,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> drivers/net/usb/catc.c | 5 +-- drivers/net/usb/kaweth.c | 8 ++-- drivers/net/usb/rtl8150.c | 16 ++++----- + drivers/usb/atm/usbatm.c | 10 +++--- + drivers/usb/atm/usbatm.h | 10 ++++-- drivers/usb/atm/xusbatm.c | 2 - drivers/usb/core/devio.c | 3 + drivers/usb/core/inode.c | 6 ++- @@ -38,7 +40,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> drivers/usb/misc/usblcd.c | 2 - drivers/usb/misc/uss720.c | 7 ++-- include/linux/usb.h | 2 - - 27 files changed, 151 insertions(+), 105 deletions(-) + 29 files changed, 164 insertions(+), 112 deletions(-) --- a/drivers/hid/usbhid/hid-core.c +++ b/drivers/hid/usbhid/hid-core.c @@ -825,6 +827,73 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> usb_kill_urb(dev->rx_urb); return res; } +--- a/drivers/usb/atm/usbatm.c ++++ b/drivers/usb/atm/usbatm.c +@@ -344,7 +344,7 @@ static void usbatm_extract_one_cell(stru + __func__, sarb->len, vcc); + /* discard cells already received */ + 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); +@@ -432,7 +432,7 @@ static void usbatm_extract_cells(struct + unsigned char *cell_buf = instance->cell_buf; + unsigned int space_left = stride - buf_usage; + +- UDSL_ASSERT(buf_usage <= stride); ++ UDSL_ASSERT(instance, buf_usage <= stride); + + if (avail_data >= space_left) { + /* add new data and process cell */ +@@ -475,7 +475,7 @@ static unsigned int usbatm_write_cells(s + unsigned int stride = instance->tx_channel.stride; + + 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; + bytes_written += stride, target += stride) { +@@ -547,7 +547,7 @@ static void usbatm_rx_process(unsigned l + if (!urb->iso_frame_desc[i].status) { + 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) + merge_start = (unsigned char *)urb->transfer_buffer + urb->iso_frame_desc[i].offset; +@@ -1189,7 +1189,7 @@ int usbatm_usb_probe(struct usb_interfac + struct urb *urb; + 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); + if (!urb) { +--- a/drivers/usb/atm/usbatm.h ++++ b/drivers/usb/atm/usbatm.h +@@ -40,9 +40,15 @@ + */ + + #ifdef DEBUG +-#define UDSL_ASSERT(x) BUG_ON(!(x)) ++#define UDSL_ASSERT(instance, x) BUG_ON(!(x)) + #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 + + #define usb_err(instance, format, arg...) \ --- a/drivers/usb/atm/xusbatm.c +++ b/drivers/usb/atm/xusbatm.c @@ -193,7 +193,7 @@ static int __init xusbatm_init(void) |