---

yaml --- r: 249388 b: refs/heads/master c: 49aecef h: refs/heads/master v: v3
git-mirror · May 6, 2011 · 17408e5 · 17408e5
1 parent 4327e0d
commit 17408e5
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5c6499d8bfff6090391ea4995512e78385b9b1e7
+refs/heads/master: 49aecefcdef5a26a7fb036d4c57573f0e0e2089b
diff --git a/trunk/drivers/staging/usbip/stub_rx.c b/trunk/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/trunk/drivers/staging/usbip/stub_tx.c b/trunk/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/trunk/drivers/staging/usbip/usbip_common.c b/trunk/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/trunk/drivers/staging/usbip/vhci_hcd.c b/trunk/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/trunk/drivers/staging/usbip/vhci_rx.c b/trunk/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;
 	}
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -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;
     	}
     }
@@ Expand Down @@