[PATCH 7/14] staging/media/as102: checkpatch fixes
Patch taken from http://kernellabs.com/hg/~dheitmueller/v4l-dvb-as102-2/
Original source and comment:
# HG changeset patch
# User Devin Heitmueller dheitmuel...@kernellabs.com
# Date 1267318867 18000
# Node ID 152825226bec049f947a844bea2c530fc9269ae5
# Parent 5916edd6739e9b8e02ff8a1e93161c4d23b50b3e
as102: checkpatch fixes
From: Devin Heitmueller dheitmuel...@kernellabs.com
Fix make checkpatch issues reported against as102_usb_drv.c.
Priority: normal
Signed-off-by: Piotr Chmura chmoor...@poczta.onet.pl
Cc: Devin Heitmueller dheitmuel...@kernellabs.com
diff --git linux/drivers/staging/media/as102/as102_usb_drv.c
linuxb/drivers/media/dvb/as102/as102_usb_drv.c
--- linux/drivers/staging/media/as102/as102_usb_drv.c
+++ linuxb/drivers/staging/media/as102/as102_usb_drv.c
@@ -1,6 +1,7 @@
/*
* Abilis Systems Single DVB-T Receiver
* Copyright (C) 2008 Pierrick Hascoet pierrick.hasc...@abilis.com
+ * Copyright (C) 2010 Devin Heitmueller dheitmuel...@kernellabs.com
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -49,7 +50,7 @@
.id_table = as102_usb_id_table
};
-struct file_operations as102_dev_fops = {
+static const struct file_operations as102_dev_fops = {
.owner = THIS_MODULE,
.open= as102_open,
.release = as102_release,
@@ -63,46 +64,48 @@
static int as102_usb_xfer_cmd(struct as102_bus_adapter_t *bus_adap,
unsigned char *send_buf, int send_buf_len,
- unsigned char *recv_buf, int recv_buf_len) {
-
+ unsigned char *recv_buf, int recv_buf_len)
+{
int ret = 0;
ENTER();
- if(send_buf != NULL) {
+ if (send_buf != NULL) {
ret = usb_control_msg(bus_adap-usb_dev,
usb_sndctrlpipe(bus_adap-usb_dev, 0),
AS102_USB_DEVICE_TX_CTRL_CMD,
- USB_DIR_OUT | USB_TYPE_VENDOR |
USB_RECIP_DEVICE,
+ USB_DIR_OUT | USB_TYPE_VENDOR |
+ USB_RECIP_DEVICE,
bus_adap-cmd_xid, /* value */
0, /* index */
send_buf, send_buf_len,
USB_CTRL_SET_TIMEOUT /* 200 */);
- if(ret 0) {
+ if (ret 0) {
dprintk(debug, usb_control_msg(send) failed, err %i\n,
ret);
return ret;
}
- if(ret != send_buf_len) {
+ if (ret != send_buf_len) {
dprintk(debug, only wrote %d of %d bytes\n,
ret, send_buf_len);
return -1;
}
}
- if(recv_buf != NULL) {
+ if (recv_buf != NULL) {
#ifdef TRACE
dprintk(debug, want to read: %d bytes\n, recv_buf_len);
#endif
ret = usb_control_msg(bus_adap-usb_dev,
usb_rcvctrlpipe(bus_adap-usb_dev, 0),
AS102_USB_DEVICE_RX_CTRL_CMD,
- USB_DIR_IN | USB_TYPE_VENDOR |
USB_RECIP_DEVICE,
+ USB_DIR_IN | USB_TYPE_VENDOR |
+ USB_RECIP_DEVICE,
bus_adap-cmd_xid, /* value */
0, /* index */
recv_buf, recv_buf_len,
USB_CTRL_GET_TIMEOUT /* 200 */);
- if(ret 0) {
+ if (ret 0) {
dprintk(debug, usb_control_msg(recv) failed, err %i\n,
ret);
return ret;
@@ -119,18 +122,19 @@
static int as102_send_ep1(struct as102_bus_adapter_t *bus_adap,
unsigned char *send_buf,
int send_buf_len,
- int swap32) {
-
+ int swap32)
+{
int ret = 0, actual_len;
- ret = usb_bulk_msg(bus_adap-usb_dev,
usb_sndbulkpipe(bus_adap-usb_dev, 1),
+ ret = usb_bulk_msg(bus_adap-usb_dev,
+ usb_sndbulkpipe(bus_adap-usb_dev, 1),
send_buf, send_buf_len, actual_len, 200);
- if(ret) {
+ if (ret) {
dprintk(debug, usb_bulk_msg(send) failed, err %i\n, ret);
return ret;
}
- if(actual_len != send_buf_len) {
+ if (actual_len != send_buf_len) {
dprintk(debug, only wrote %d of %d bytes\n,
actual_len, send_buf_len);
return -1;
@@ -139,21
[RESEND PATCH 7/14] staging/media/as102: checkpatch fixes
Patch taken from http://kernellabs.com/hg/~dheitmueller/v4l-dvb-as102-2/
Original source and comment:
# HG changeset patch
# User Devin Heitmueller dheitmuel...@kernellabs.com
# Date 1267318867 18000
# Node ID 152825226bec049f947a844bea2c530fc9269ae5
# Parent 5916edd6739e9b8e02ff8a1e93161c4d23b50b3e
as102: checkpatch fixes
From: Devin Heitmueller dheitmuel...@kernellabs.com
Fix make checkpatch issues reported against as102_usb_drv.c.
Priority: normal
Signed-off-by: Devin Heitmueller dheitmuel...@kernellabs.com
Signed-off-by: Piotr Chmura chmoor...@poczta.onet.pl
diff --git linux/drivers/staging/media/as102/as102_usb_drv.c
linuxb/drivers/media/dvb/as102/as102_usb_drv.c
--- linux/drivers/staging/media/as102/as102_usb_drv.c
+++ linuxb/drivers/staging/media/as102/as102_usb_drv.c
@@ -1,6 +1,7 @@
/*
* Abilis Systems Single DVB-T Receiver
* Copyright (C) 2008 Pierrick Hascoet pierrick.hasc...@abilis.com
+ * Copyright (C) 2010 Devin Heitmueller dheitmuel...@kernellabs.com
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -49,7 +50,7 @@
.id_table = as102_usb_id_table
};
-struct file_operations as102_dev_fops = {
+static const struct file_operations as102_dev_fops = {
.owner = THIS_MODULE,
.open= as102_open,
.release = as102_release,
@@ -63,46 +64,48 @@
static int as102_usb_xfer_cmd(struct as102_bus_adapter_t *bus_adap,
unsigned char *send_buf, int send_buf_len,
- unsigned char *recv_buf, int recv_buf_len) {
-
+ unsigned char *recv_buf, int recv_buf_len)
+{
int ret = 0;
ENTER();
- if(send_buf != NULL) {
+ if (send_buf != NULL) {
ret = usb_control_msg(bus_adap-usb_dev,
usb_sndctrlpipe(bus_adap-usb_dev, 0),
AS102_USB_DEVICE_TX_CTRL_CMD,
- USB_DIR_OUT | USB_TYPE_VENDOR |
USB_RECIP_DEVICE,
+ USB_DIR_OUT | USB_TYPE_VENDOR |
+ USB_RECIP_DEVICE,
bus_adap-cmd_xid, /* value */
0, /* index */
send_buf, send_buf_len,
USB_CTRL_SET_TIMEOUT /* 200 */);
- if(ret 0) {
+ if (ret 0) {
dprintk(debug, usb_control_msg(send) failed, err %i\n,
ret);
return ret;
}
- if(ret != send_buf_len) {
+ if (ret != send_buf_len) {
dprintk(debug, only wrote %d of %d bytes\n,
ret, send_buf_len);
return -1;
}
}
- if(recv_buf != NULL) {
+ if (recv_buf != NULL) {
#ifdef TRACE
dprintk(debug, want to read: %d bytes\n, recv_buf_len);
#endif
ret = usb_control_msg(bus_adap-usb_dev,
usb_rcvctrlpipe(bus_adap-usb_dev, 0),
AS102_USB_DEVICE_RX_CTRL_CMD,
- USB_DIR_IN | USB_TYPE_VENDOR |
USB_RECIP_DEVICE,
+ USB_DIR_IN | USB_TYPE_VENDOR |
+ USB_RECIP_DEVICE,
bus_adap-cmd_xid, /* value */
0, /* index */
recv_buf, recv_buf_len,
USB_CTRL_GET_TIMEOUT /* 200 */);
- if(ret 0) {
+ if (ret 0) {
dprintk(debug, usb_control_msg(recv) failed, err %i\n,
ret);
return ret;
@@ -119,18 +122,19 @@
static int as102_send_ep1(struct as102_bus_adapter_t *bus_adap,
unsigned char *send_buf,
int send_buf_len,
- int swap32) {
-
+ int swap32)
+{
int ret = 0, actual_len;
- ret = usb_bulk_msg(bus_adap-usb_dev,
usb_sndbulkpipe(bus_adap-usb_dev, 1),
+ ret = usb_bulk_msg(bus_adap-usb_dev,
+ usb_sndbulkpipe(bus_adap-usb_dev, 1),
send_buf, send_buf_len, actual_len, 200);
- if(ret) {
+ if (ret) {
dprintk(debug, usb_bulk_msg(send) failed, err %i\n, ret);
return ret;
}
- if(actual_len != send_buf_len) {
+ if (actual_len != send_buf_len) {
dprintk(debug, only wrote %d of %d bytes\n,
actual_len, send_buf_len);
return -1;
