From: matt mooney <mfm@muteddisk.com> To: Greg Kroah-Hartman <greg@kroah.com> Cc: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH 14/16] staging: usbip: add break to default case in switch statements Date: Fri, 6 May 2011 03:47:54 -0700 [thread overview] Message-ID: <06c01137af0f06f5bbb08efe65d78ecaaad8f484.1304676742.git.mfm@muteddisk.com> (raw) In-Reply-To: <cover.1304676742.git.mfm@muteddisk.com> For consistency, a break statement is added to all default cases that do not jump to a label. Signed-off-by: matt mooney <mfm@muteddisk.com> --- drivers/staging/usbip/stub_rx.c | 2 +- drivers/staging/usbip/stub_tx.c | 1 + drivers/staging/usbip/usbip_common.c | 13 ++++++++++--- drivers/staging/usbip/vhci_hcd.c | 2 ++ drivers/staging/usbip/vhci_rx.c | 3 ++- 5 files changed, 16 insertions(+), 5 deletions(-) diff --git a/drivers/staging/usbip/stub_rx.c b/drivers/staging/usbip/stub_rx.c index ac4dd4d..e11ac2a 100644 --- a/drivers/staging/usbip/stub_rx.c +++ b/drivers/staging/usbip/stub_rx.c @@ -594,7 +594,7 @@ static void stub_rx_pdu(struct usbip_device *ud) /* NOTREACHED */ dev_err(dev, "unknown pdu\n"); usbip_event_add(ud, SDEV_EVENT_ERROR_TCP); - return; + break; } } diff --git a/drivers/staging/usbip/stub_tx.c b/drivers/staging/usbip/stub_tx.c index bbf207d..76d82b2 100644 --- a/drivers/staging/usbip/stub_tx.c +++ b/drivers/staging/usbip/stub_tx.c @@ -91,6 +91,7 @@ void stub_complete(struct urb *urb) default: usbip_uinfo("urb completion with non-zero status %d\n", urb->status); + break; } /* link a urb to the queue of tx. */ diff --git a/drivers/staging/usbip/usbip_common.c b/drivers/staging/usbip/usbip_common.c index cd66d56..a6ae67c 100644 --- a/drivers/staging/usbip/usbip_common.c +++ b/drivers/staging/usbip/usbip_common.c @@ -91,6 +91,7 @@ static void usbip_dump_pipe(unsigned int p) break; default: printk(KERN_DEBUG "ERR"); + break; } printk(KERN_DEBUG "\n"); @@ -120,6 +121,7 @@ static void usbip_dump_usb_device(struct usb_device *udev) break; default: printk(KERN_DEBUG " SPD_ERROR"); + break; } printk(KERN_DEBUG " tt %p, ttport %d", udev->tt, udev->ttport); @@ -187,6 +189,7 @@ static void usbip_dump_request_type(__u8 rt) break; default: printk(KERN_DEBUG "------"); + break; } } @@ -244,6 +247,7 @@ static void usbip_dump_usb_ctrlrequest(struct usb_ctrlrequest *cmd) break; default: printk(KERN_DEBUG "REQ(%02X) ", cmd->bRequest); + break; } printk(KERN_DEBUG " "); @@ -342,7 +346,8 @@ void usbip_dump_header(struct usbip_header *pdu) break; default: /* NOT REACHED */ - usbip_udbg("UNKNOWN\n"); + usbip_udbg("unknown command\n"); + break; } } EXPORT_SYMBOL_GPL(usbip_dump_header); @@ -537,9 +542,10 @@ void usbip_pack_pdu(struct usbip_header *pdu, struct urb *urb, int cmd, usbip_pack_ret_submit(pdu, urb, pack); break; default: + /* NOT REACHED */ err("unknown command"); - /* NOTREACHED */ /* BUG(); */ + break; } } EXPORT_SYMBOL_GPL(usbip_pack_pdu); @@ -643,9 +649,10 @@ void usbip_header_correct_endian(struct usbip_header *pdu, int send) correct_endian_ret_unlink(&pdu->u.ret_unlink, send); break; default: - /* NOTREACHED */ + /* NOT REACHED */ err("unknown command in pdu header: %d", cmd); /* BUG(); */ + break; } } EXPORT_SYMBOL_GPL(usbip_header_correct_endian); diff --git a/drivers/staging/usbip/vhci_hcd.c b/drivers/staging/usbip/vhci_hcd.c index 86d85cc..47884d1 100644 --- a/drivers/staging/usbip/vhci_hcd.c +++ b/drivers/staging/usbip/vhci_hcd.c @@ -320,6 +320,7 @@ static int vhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, usbip_dbg_vhci_rh(" ClearPortFeature: default %x\n", wValue); dum->port_status[rhport] &= ~(1 << wValue); + break; } break; case GetHubDescriptor: @@ -451,6 +452,7 @@ static int vhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, usbip_dbg_vhci_rh(" SetPortFeature: default %d\n", wValue); dum->port_status[rhport] |= (1 << wValue); + break; } break; diff --git a/drivers/staging/usbip/vhci_rx.c b/drivers/staging/usbip/vhci_rx.c index 61b9fc7..46f2ee5 100644 --- a/drivers/staging/usbip/vhci_rx.c +++ b/drivers/staging/usbip/vhci_rx.c @@ -247,10 +247,11 @@ static void vhci_rx_pdu(struct usbip_device *ud) vhci_recv_ret_unlink(vdev, &pdu); break; default: - /* NOTREACHED */ + /* NOT REACHED */ usbip_uerr("unknown pdu %u\n", pdu.base.command); usbip_dump_header(&pdu); usbip_event_add(ud, VDEV_EVENT_ERROR_TCP); + break; } } -- 1.7.5.1
WARNING: multiple messages have this Message-ID (diff)
From: matt mooney <mfm@muteddisk.com> To: Greg Kroah-Hartman <greg@kroah.com> Cc: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH 14/16] staging: usbip: add break to default case in switch statements Date: Fri, 06 May 2011 10:47:54 +0000 [thread overview] Message-ID: <06c01137af0f06f5bbb08efe65d78ecaaad8f484.1304676742.git.mfm@muteddisk.com> (raw) In-Reply-To: <cover.1304676742.git.mfm@muteddisk.com> For consistency, a break statement is added to all default cases that do not jump to a label. Signed-off-by: matt mooney <mfm@muteddisk.com> --- drivers/staging/usbip/stub_rx.c | 2 +- drivers/staging/usbip/stub_tx.c | 1 + drivers/staging/usbip/usbip_common.c | 13 ++++++++++--- drivers/staging/usbip/vhci_hcd.c | 2 ++ drivers/staging/usbip/vhci_rx.c | 3 ++- 5 files changed, 16 insertions(+), 5 deletions(-) diff --git a/drivers/staging/usbip/stub_rx.c b/drivers/staging/usbip/stub_rx.c index ac4dd4d..e11ac2a 100644 --- a/drivers/staging/usbip/stub_rx.c +++ b/drivers/staging/usbip/stub_rx.c @@ -594,7 +594,7 @@ static void stub_rx_pdu(struct usbip_device *ud) /* NOTREACHED */ dev_err(dev, "unknown pdu\n"); usbip_event_add(ud, SDEV_EVENT_ERROR_TCP); - return; + break; } } diff --git a/drivers/staging/usbip/stub_tx.c b/drivers/staging/usbip/stub_tx.c index bbf207d..76d82b2 100644 --- a/drivers/staging/usbip/stub_tx.c +++ b/drivers/staging/usbip/stub_tx.c @@ -91,6 +91,7 @@ void stub_complete(struct urb *urb) default: usbip_uinfo("urb completion with non-zero status %d\n", urb->status); + break; } /* link a urb to the queue of tx. */ diff --git a/drivers/staging/usbip/usbip_common.c b/drivers/staging/usbip/usbip_common.c index cd66d56..a6ae67c 100644 --- a/drivers/staging/usbip/usbip_common.c +++ b/drivers/staging/usbip/usbip_common.c @@ -91,6 +91,7 @@ static void usbip_dump_pipe(unsigned int p) break; default: printk(KERN_DEBUG "ERR"); + break; } printk(KERN_DEBUG "\n"); @@ -120,6 +121,7 @@ static void usbip_dump_usb_device(struct usb_device *udev) break; default: printk(KERN_DEBUG " SPD_ERROR"); + break; } printk(KERN_DEBUG " tt %p, ttport %d", udev->tt, udev->ttport); @@ -187,6 +189,7 @@ static void usbip_dump_request_type(__u8 rt) break; default: printk(KERN_DEBUG "------"); + break; } } @@ -244,6 +247,7 @@ static void usbip_dump_usb_ctrlrequest(struct usb_ctrlrequest *cmd) break; default: printk(KERN_DEBUG "REQ(%02X) ", cmd->bRequest); + break; } printk(KERN_DEBUG " "); @@ -342,7 +346,8 @@ void usbip_dump_header(struct usbip_header *pdu) break; default: /* NOT REACHED */ - usbip_udbg("UNKNOWN\n"); + usbip_udbg("unknown command\n"); + break; } } EXPORT_SYMBOL_GPL(usbip_dump_header); @@ -537,9 +542,10 @@ void usbip_pack_pdu(struct usbip_header *pdu, struct urb *urb, int cmd, usbip_pack_ret_submit(pdu, urb, pack); break; default: + /* NOT REACHED */ err("unknown command"); - /* NOTREACHED */ /* BUG(); */ + break; } } EXPORT_SYMBOL_GPL(usbip_pack_pdu); @@ -643,9 +649,10 @@ void usbip_header_correct_endian(struct usbip_header *pdu, int send) correct_endian_ret_unlink(&pdu->u.ret_unlink, send); break; default: - /* NOTREACHED */ + /* NOT REACHED */ err("unknown command in pdu header: %d", cmd); /* BUG(); */ + break; } } EXPORT_SYMBOL_GPL(usbip_header_correct_endian); diff --git a/drivers/staging/usbip/vhci_hcd.c b/drivers/staging/usbip/vhci_hcd.c index 86d85cc..47884d1 100644 --- a/drivers/staging/usbip/vhci_hcd.c +++ b/drivers/staging/usbip/vhci_hcd.c @@ -320,6 +320,7 @@ static int vhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, usbip_dbg_vhci_rh(" ClearPortFeature: default %x\n", wValue); dum->port_status[rhport] &= ~(1 << wValue); + break; } break; case GetHubDescriptor: @@ -451,6 +452,7 @@ static int vhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, usbip_dbg_vhci_rh(" SetPortFeature: default %d\n", wValue); dum->port_status[rhport] |= (1 << wValue); + break; } break; diff --git a/drivers/staging/usbip/vhci_rx.c b/drivers/staging/usbip/vhci_rx.c index 61b9fc7..46f2ee5 100644 --- a/drivers/staging/usbip/vhci_rx.c +++ b/drivers/staging/usbip/vhci_rx.c @@ -247,10 +247,11 @@ static void vhci_rx_pdu(struct usbip_device *ud) vhci_recv_ret_unlink(vdev, &pdu); break; default: - /* NOTREACHED */ + /* NOT REACHED */ usbip_uerr("unknown pdu %u\n", pdu.base.command); usbip_dump_header(&pdu); usbip_event_add(ud, VDEV_EVENT_ERROR_TCP); + break; } } -- 1.7.5.1
next prev parent reply other threads:[~2011-05-06 10:54 UTC|newest] Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-05-06 10:47 [PATCH 00/16] staging: usbip: cleanup matt mooney 2011-05-06 10:47 ` matt mooney 2011-05-06 10:47 ` [PATCH 01/16] staging: usbip: stub_dev.c: coding style cleanup matt mooney 2011-05-06 10:47 ` matt mooney 2011-05-06 10:47 ` [PATCH 02/16] staging: usbip: stub_main.c: " matt mooney 2011-05-06 10:47 ` matt mooney 2011-05-06 10:47 ` [PATCH 03/16] staging: usbip: stub_rx.c: " matt mooney 2011-05-06 10:47 ` matt mooney 2011-05-06 10:47 ` [PATCH 04/16] staging: usbip: stub_tx.c: " matt mooney 2011-05-06 10:47 ` matt mooney 2011-05-06 10:47 ` [PATCH 05/16] staging: usbip: usbip_common.h: " matt mooney 2011-05-06 10:47 ` matt mooney 2011-05-06 10:47 ` [PATCH 06/16] staging: usbip: usbip_common.c: " matt mooney 2011-05-06 10:47 ` matt mooney 2011-05-06 10:47 ` [PATCH 07/16] staging: usbip: usbip_event.c: " matt mooney 2011-05-06 10:47 ` matt mooney 2011-05-06 10:47 ` [PATCH 08/16] staging: usbip: stub.h: " matt mooney 2011-05-06 10:47 ` matt mooney 2011-05-06 10:47 ` [PATCH 09/16] staging: usbip: vhci.h: " matt mooney 2011-05-06 10:47 ` matt mooney 2011-05-06 10:47 ` [PATCH 10/16] staging: usbip: vhci_hcd.c: " matt mooney 2011-05-06 10:47 ` matt mooney 2011-05-06 10:47 ` [PATCH 11/16] staging: usbip: vhci_rx.c: " matt mooney 2011-05-06 10:47 ` matt mooney 2011-05-06 10:47 ` [PATCH 12/16] staging: usbip: vhci_sysfs.c: " matt mooney 2011-05-06 10:47 ` matt mooney 2011-05-06 10:47 ` [PATCH 13/16] staging: usbip: vhci_tx.c: " matt mooney 2011-05-06 10:47 ` matt mooney 2011-05-06 10:47 ` matt mooney [this message] 2011-05-06 10:47 ` [PATCH 14/16] staging: usbip: add break to default case in switch statements matt mooney 2011-05-06 10:47 ` [PATCH 15/16] staging: usbip: remove section dividers matt mooney 2011-05-06 10:47 ` matt mooney 2011-05-06 10:47 ` [PATCH 16/16] staging: usbip: fixup MODULE_ macros matt mooney 2011-05-06 10:47 ` matt mooney 2011-05-06 21:27 ` [PATCH 00/16] staging: usbip: cleanup Greg KH 2011-05-06 21:27 ` Greg KH
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=06c01137af0f06f5bbb08efe65d78ecaaad8f484.1304676742.git.mfm@muteddisk.com \ --to=mfm@muteddisk.com \ --cc=greg@kroah.com \ --cc=kernel-janitors@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.