Fixing checkstyle warnings except symbolic permission warnings
(e.g. for S_IWUSR etc.). The symbolic permission warnings seem
to be widespread; so not fixing those as Im likely missing
some context on why these are widespread.
Build worked after my changes.
Signed-off-by: Jai Krishna <rjk1024@xxxxxxxxx>
---
drivers/usb/usbip/stub_dev.c | 3 ++-
drivers/usb/usbip/stub_tx.c | 2 +-
drivers/usb/usbip/usbip_event.c | 3 +--
drivers/usb/usbip/vhci_hcd.c | 8 +++++---
drivers/usb/usbip/vhci_sysfs.c | 3 +--
drivers/usb/usbip/vudc_transfer.c | 6 +++---
6 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/drivers/usb/usbip/stub_dev.c b/drivers/usb/usbip/stub_dev.c
index c653ce5..469248b 100644
--- a/drivers/usb/usbip/stub_dev.c
+++ b/drivers/usb/usbip/stub_dev.c
@@ -471,7 +471,8 @@ static void stub_disconnect(struct usb_device *udev)
#ifdef CONFIG_PM
/* These functions need usb_port_suspend and usb_port_resume,
- * which reside in drivers/usb/core/usb.h. Skip for now. */
+ * which reside in drivers/usb/core/usb.h. Skip for now.
+ */
static int stub_suspend(struct usb_device *udev, pm_message_t message)
{
diff --git a/drivers/usb/usbip/stub_tx.c b/drivers/usb/usbip/stub_tx.c
index 6b1e8c3..1f391ae 100644
--- a/drivers/usb/usbip/stub_tx.c
+++ b/drivers/usb/usbip/stub_tx.c
@@ -239,7 +239,7 @@ static int stub_send_ret_submit(struct stub_device *sdev)
kfree(iov);
usbip_event_add(&sdev->ud,
SDEV_EVENT_ERROR_TCP);
- return -1;
+ return -1;
}
}
diff --git a/drivers/usb/usbip/usbip_event.c b/drivers/usb/usbip/usbip_event.c
index f163566..ec211d0 100644
--- a/drivers/usb/usbip/usbip_event.c
+++ b/drivers/usb/usbip/usbip_event.c
@@ -77,9 +77,8 @@ static void event_handler(struct work_struct *work)
{
struct usbip_device *ud;
- if (worker_context == NULL) {
+ if (worker_context == NULL)
worker_context = current;
- }
while ((ud = get_event()) != NULL) {
usbip_dbg_eh("pending event %lx\n", ud->event);
diff --git a/drivers/usb/usbip/vhci_hcd.c b/drivers/usb/usbip/vhci_hcd.c
index 03eccf2..00c1593 100644
--- a/drivers/usb/usbip/vhci_hcd.c
+++ b/drivers/usb/usbip/vhci_hcd.c
@@ -672,8 +672,9 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
priv = urb->hcpriv;
if (!priv) {
- /* URB was never linked! or will be soon given back by
- * vhci_rx. */
+ /* URB was never linked! or
+ * will be soon given back by vhci_rx
+ */
spin_unlock_irqrestore(&vhci->lock, flags);
return -EIDRM;
}
@@ -739,7 +740,8 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
pr_info("device %p seems to be still connected\n", vdev);
/* send cmd_unlink and try to cancel the pending URB in the
- * peer */
+ * peer
+ */
list_add_tail(&unlink->list, &vdev->unlink_tx);
wake_up(&vdev->waitq_tx);
diff --git a/drivers/usb/usbip/vhci_sysfs.c b/drivers/usb/usbip/vhci_sysfs.c
index c404017..0547f77 100644
--- a/drivers/usb/usbip/vhci_sysfs.c
+++ b/drivers/usb/usbip/vhci_sysfs.c
@@ -224,9 +224,8 @@ static DEVICE_ATTR(detach, S_IWUSR, NULL, store_detach);
static int valid_args(__u32 pdev_nr, __u32 rhport, enum usb_device_speed speed)
{
- if (!valid_port(pdev_nr, rhport)) {
+ if (!valid_port(pdev_nr, rhport))
return 0;
- }
switch (speed) {
case USB_SPEED_LOW:
diff --git a/drivers/usb/usbip/vudc_transfer.c b/drivers/usb/usbip/vudc_transfer.c
index aba6bd4..8b3dacc 100644
--- a/drivers/usb/usbip/vudc_transfer.c
+++ b/drivers/usb/usbip/vudc_transfer.c
@@ -73,8 +73,8 @@ static int handle_control_request(struct vudc *udc, struct urb *urb,
{
struct vep *ep2;
int ret_val = 1;
- unsigned w_index;
- unsigned w_value;
+ unsigned int w_index;
+ unsigned int w_value;
w_index = le16_to_cpu(setup->wIndex);
w_value = le16_to_cpu(setup->wValue);
@@ -200,7 +200,7 @@ static int transfer(struct vudc *udc,
top:
/* if there's no request queued, the device is NAKing; return */
list_for_each_entry(req, &ep->req_queue, req_entry) {
- unsigned host_len, dev_len, len;
+ unsigned int host_len, dev_len, len;
void *ubuf_pos, *rbuf_pos;
int is_short, to_host;
int rescan = 0;
--
2.7.4
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
