[OPW,kernel,v2] Staging: btmtk_usb: Fix line length exceeding 80 characters
diff mbox

Message ID 1381008111-6820-1-git-send-email-rashika.kheria@gmail.com
State Changes Requested
Headers show

Commit Message

Rashika Oct. 5, 2013, 9:21 p.m. UTC
Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
---
 drivers/staging/btmtk_usb/btmtk_usb.c |  132 ++++++++++++++++++++-------------
 1 file changed, 82 insertions(+), 50 deletions(-)

Comments

Josh Triplett Oct. 5, 2013, 9:39 p.m. UTC | #1
On Sun, Oct 06, 2013 at 02:51:51AM +0530, Rashika Kheria wrote:
> Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>

This mostly looks reasonable, except:

>  			} else {
>  				BT_ERR("Firmware file \"%s\" request failed (err=%d) \n",
> -					MT7650_FIRMWARE, ret);
> +						MT7650_FIRMWARE, ret);

Don't make this unrelated change in the same commit.

>  			} else {
>  				BT_ERR("Firmware file \"%s\" request failed (err=%d)\n",
> -					MT7662_FIRMWARE, ret);
> +						MT7662_FIRMWARE, ret);

Likewise.

> @@ -442,7 +453,8 @@ load_patch_protect:
>  
>  			pos[8] = phase;
>  
> -			memcpy(&pos[9], data->firmware->data + PATCH_INFO_SIZE + cur_len, sent_len);
> +			memcpy(&pos[9], data->firmware->data + PATCH_INFO_SIZE +
> +					cur_len, sent_len);

Not the best place to break that line.

> @@ -480,7 +493,8 @@ load_patch_protect:
>  		}
>  	}
>  
> -	total_checksum = checksume16((u8 *)data->firmware->data + PATCH_INFO_SIZE, patch_len);
> +	total_checksum = checksume16((u8 *)data->firmware->data +
> +			PATCH_INFO_SIZE, patch_len);

Likewise.

> @@ -657,7 +675,8 @@ loadfw_protect:
>  
>  	/* Loading ILM */
>  	while (1) {
> -		sent_len = (ilm_len - cur_len) >= 14336 ? 14336 : (ilm_len - cur_len);
> +		sent_len = (ilm_len - cur_len) >= 14336 ? 14336 :
> +			(ilm_len - cur_len);

Not in this commit, but you could actually change this to use the "min"
function instead.

> @@ -714,7 +736,8 @@ loadfw_protect:
>  
>  	/* Loading DLM */
>  	while (1) {
> -		sent_len = (dlm_len - cur_len) >= 14336 ? 14336 : (dlm_len - cur_len);
> +		sent_len = (dlm_len - cur_len) >= 14336 ? 14336 :
> +			(dlm_len - cur_len);

Likewise.  Wow, there's a lot of duplicated code in this driver.

> @@ -1015,7 +1040,8 @@ static void btmtk_usb_isoc_in_complete(struct urb *urb)
>  	if (urb->status == 0) {
>  		for (i = 0; i < urb->number_of_packets; i++) {
>  			unsigned int offset = urb->iso_frame_desc[i].offset;
> -			unsigned int length = urb->iso_frame_desc[i].actual_length;
> +			unsigned int length =
> +				urb->iso_frame_desc[i].actual_length;

Better to fix this one by changing the initializer into an assignment:
first declare length then assign to it.

- Josh Triplett
Rashika Oct. 5, 2013, 10:07 p.m. UTC | #2
Not word wrapped; came through fine.

>
> (Also, please keep the list CCed on replies.)
>
> - Josh Triplett
>

Ok Thanks. I will keep that in mind.
Rashika Oct. 6, 2013, 9:48 p.m. UTC | #3
> @@ -442,7 +453,8 @@ load_patch_protect:
> >
> >                       pos[8] = phase;
> >
> > -                     memcpy(&pos[9], data->firmware->data +
> PATCH_INFO_SIZE + cur_len, sent_len);
> > +                     memcpy(&pos[9], data->firmware->data +
> PATCH_INFO_SIZE +
> > +                                     cur_len, sent_len);
>
> Not the best place to break that line.
>
> > @@ -480,7 +493,8 @@ load_patch_protect:
> >               }
> >       }
> >
> > -     total_checksum = checksume16((u8 *)data->firmware->data +
> PATCH_INFO_SIZE, patch_len);
> > +     total_checksum = checksume16((u8 *)data->firmware->data +
> > +                     PATCH_INFO_SIZE, patch_len);
>
> Hi Josh,
>

You suggested to break the line at correct positions. I have two
approaches to solve this -

a) Break the line at each argument like
            memcpy(&pos[9],
                                          data->firmware->data +
PATCH_INFO_SIZE + cur_len,
                                          sent_len);
This will not work because the second argument is still exceeding 80
characters because of indentation.

b) Introduction of new variable that can store the value of second
argument. But since the variable name may turn out to be improper or out of
context,

Hence I wanted to confirm what should I do to resolve this problem.

Thanks in advance,

Regards,
Rashika Kheria



> 
>
>
Josh Triplett Oct. 6, 2013, 10:03 p.m. UTC | #4
On Sun, Oct 06, 2013 at 06:52:17AM -0700, Rashika Kheria wrote:
> 

When you reply and quote the original mail, and trim the quote down to
just what you're replying to as you correctly did, you should keep the
attribution lines of those quotes.  The top of a mail should look a lot
like this:

Person A wrote:
> Person B wote:
>> Person C wrote:
>>> Original text from person C.
>>
>> Response from person B.
>
> Response from person A.

Response from you.


That way, you can tell who wrote each part of that mail, even deep in a
thread.


Also, when you replied, you seem to have word-wrapped the patch.

> > > @@ -442,7 +453,8 @@ load_patch_protect: 
> > >   
> > >                          pos[8] = phase; 
> > >   
> > > -                        memcpy(&pos[9], data->firmware->data + 
> > PATCH_INFO_SIZE + cur_len, sent_len); 
> > > +                        memcpy(&pos[9], data->firmware->data + 
> > PATCH_INFO_SIZE + 
> > > +                                        cur_len, sent_len); 
> >
> > Not the best place to break that line. 
> >   
> >
> 
> Hi Josh,
> 
> You recommended to break the line at the right place. I have two approaches 
> for the same - 
> 
> 1) Separate the argument of the function each at new line like:
> 
>                     memcpy(&pos[9], 
>                                           data->firmware->data + 
> PATCH_INFO_SIZE + cur_len, 
>                                           sent_len);
>  
> but due to indentation the second argument still exceeds 80 characters.

I'd go with this, since it seems preferable to break around arguments
before breaking around operators.  With the second argument still
exceeding 80 characters, I'd normally suggest breaking around one of the
+s *after* putting each argument onto its own line.  However, in this
particular case, there's an even better alternative.  This whole
heavily-indented block is wrapped in an "if (sent_len > 0) {", and the
corresponding "else" block is just a "break;" statement.  You could flip
the condition around to be "if (sent_len <= 0)", put the break in that
single-line if, and then outdent all the code in that block.  I checked,
and outdenting that block gives enough room to leave the second argument
un-wrapped without exceeding 80 characters.  (Note that you only need to
indent the second and third arguments with a single tab beyond the
indentation level of the memcpy.)

- Josh Triplett
Rashika Oct. 6, 2013, 10:14 p.m. UTC | #5
On Mon, Oct 7, 2013 at 3:33 AM, Josh Triplett <josh@joshtriplett.org> wrote:

> On Sun, Oct 06, 2013 at 06:52:17AM -0700, Rashika Kheria wrote:
> >
>
>
> I'd go with this, since it seems preferable to break around arguments
> before breaking around operators.  With the second argument still
> exceeding 80 characters, I'd normally suggest breaking around one of the
> +s *after* putting each argument onto its own line.  However, in this
> particular case, there's an even better alternative.  This whole
> heavily-indented block is wrapped in an "if (sent_len > 0) {", and the
> corresponding "else" block is just a "break;" statement.  You could flip
> the condition around to be "if (sent_len <= 0)", put the break in that
> single-line if, and then outdent all the code in that block.  I checked,
> and outdenting that block gives enough room to leave the second argument
> un-wrapped without exceeding 80 characters.  (Note that you only need to
> indent the second and third arguments with a single tab beyond the
> indentation level of the memcpy.)
>
> Hi Josh,

Thanks for you reply. It is really very interesting suggestion.

I will keep such things in mind for further patches. I also wanted to ask
you whether I am allowed to remove the redundant code by introducing new
functions since the function name can be generic.

Regards,

Rashika Kheria

>
>
> --
> You received this message because you are subscribed to the Google Groups
> "opw-kernel" group.
> To unsubscribe from this group and stop receiving emails from it, send an
> email to opw-kernel+unsubscribe@googlegroups.com.
> For more options, visit https://groups.google.com/groups/opt_out.
>
Josh Triplett Oct. 6, 2013, 10:20 p.m. UTC | #6
On Mon, Oct 07, 2013 at 03:44:29AM +0530, Rashika Kheria wrote:
> On Mon, Oct 7, 2013 at 3:33 AM, Josh Triplett <josh@joshtriplett.org> wrote:
> > On Sun, Oct 06, 2013 at 06:52:17AM -0700, Rashika Kheria wrote:
> > I'd go with this, since it seems preferable to break around arguments
> > before breaking around operators.  With the second argument still
> > exceeding 80 characters, I'd normally suggest breaking around one of the
> > +s *after* putting each argument onto its own line.  However, in this
> > particular case, there's an even better alternative.  This whole
> > heavily-indented block is wrapped in an "if (sent_len > 0) {", and the
> > corresponding "else" block is just a "break;" statement.  You could flip
> > the condition around to be "if (sent_len <= 0)", put the break in that
> > single-line if, and then outdent all the code in that block.  I checked,
> > and outdenting that block gives enough room to leave the second argument
> > un-wrapped without exceeding 80 characters.  (Note that you only need to
> > indent the second and third arguments with a single tab beyond the
> > indentation level of the memcpy.)
> 
> Thanks for you reply. It is really very interesting suggestion.
> 
> I will keep such things in mind for further patches. I also wanted to ask
> you whether I am allowed to remove the redundant code by introducing new
> functions since the function name can be generic.

Yes, introducing functions to replace deeply nested code can produce a
highly welcome refactoring, especially if the function can be used more
than once to eliminate duplicated code as well.  Please feel free to
make such changes when you see a good opportunity, especially in staging
drivers.

- Josh Triplett

Patch
diff mbox

diff --git a/drivers/staging/btmtk_usb/btmtk_usb.c b/drivers/staging/btmtk_usb/btmtk_usb.c
index 0e783e8..0acd491 100644
--- a/drivers/staging/btmtk_usb/btmtk_usb.c
+++ b/drivers/staging/btmtk_usb/btmtk_usb.c
@@ -16,7 +16,8 @@ 
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *  or on the worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *  or on the worldwide web at
+ *  http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
  *
  */
 
@@ -72,8 +73,9 @@  static int btmtk_usb_reset(struct usb_device *udev)
 
 	BT_DBG("%s\n", __func__);
 
-	ret = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x01, DEVICE_VENDOR_REQUEST_OUT,
-						  0x01, 0x00, NULL, 0x00, CONTROL_TIMEOUT_JIFFIES);
+	ret = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x01,
+			DEVICE_VENDOR_REQUEST_OUT, 0x01, 0x00, NULL, 0x00,
+			CONTROL_TIMEOUT_JIFFIES);
 
 	if (ret < 0) {
 		BT_ERR("%s error(%d)\n", __func__, ret);
@@ -92,13 +94,14 @@  static int btmtk_usb_io_read32(struct btmtk_usb_data *data, u32 reg, u32 *val)
 	struct usb_device *udev = data->udev;
 	int ret;
 
-	ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), request, DEVICE_VENDOR_REQUEST_IN,
-						  0x0, reg, data->io_buf, 4,
-						  CONTROL_TIMEOUT_JIFFIES);
+	ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), request,
+			DEVICE_VENDOR_REQUEST_IN, 0x0, reg, data->io_buf, 4,
+			CONTROL_TIMEOUT_JIFFIES);
 
 	if (ret < 0) {
 		*val = 0xffffffff;
-		BT_ERR("%s error(%d), reg=%x, value=%x\n", __func__, ret, reg, *val);
+		BT_ERR("%s error(%d), reg=%x, value=%x\n", __func__, ret, reg,
+				*val);
 		return ret;
 	}
 
@@ -122,12 +125,13 @@  static int btmtk_usb_io_write32(struct btmtk_usb_data *data, u32 reg, u32 val)
 	index = (u16)reg;
 	value = val & 0x0000ffff;
 
-	ret = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), request, DEVICE_VENDOR_REQUEST_OUT,
-						  value, index, NULL, 0,
-						  CONTROL_TIMEOUT_JIFFIES);
+	ret = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), request,
+			DEVICE_VENDOR_REQUEST_OUT, value, index, NULL, 0,
+			CONTROL_TIMEOUT_JIFFIES);
 
 	if (ret < 0) {
-		BT_ERR("%s error(%d), reg=%x, value=%x\n", __func__, ret, reg, val);
+		BT_ERR("%s error(%d), reg=%x, value=%x\n", __func__, ret, reg,
+				val);
 		return ret;
 	}
 
@@ -139,7 +143,8 @@  static int btmtk_usb_io_write32(struct btmtk_usb_data *data, u32 reg, u32 val)
 				value, index, NULL, 0, CONTROL_TIMEOUT_JIFFIES);
 
 	if (ret < 0) {
-		BT_ERR("%s error(%d), reg=%x, value=%x\n", __func__, ret, reg, val);
+		BT_ERR("%s error(%d), reg=%x, value=%x\n", __func__, ret, reg,
+				val);
 		return ret;
 	}
 
@@ -186,13 +191,15 @@  static void btmtk_usb_cap_init(struct btmtk_usb_data *data)
 		ret = request_firmware(&firmware, MT7650_FIRMWARE, &udev->dev);
 		if (ret < 0) {
 			if (ret == -ENOENT) {
-				BT_ERR("Firmware file \"%s\" not found \n", MT7650_FIRMWARE);
+				BT_ERR("Firmware file \"%s\" not found \n",
+						MT7650_FIRMWARE);
 			} else {
 				BT_ERR("Firmware file \"%s\" request failed (err=%d) \n",
-					MT7650_FIRMWARE, ret);
+						MT7650_FIRMWARE, ret);
 			}
 		} else {
-			BT_DBG("Firmware file \"%s\" Found \n", MT7650_FIRMWARE);
+			BT_DBG("Firmware file \"%s\" Found \n",
+					MT7650_FIRMWARE);
 			/* load firmware here */
 			data->firmware = firmware;
 			btmtk_usb_load_fw(data);
@@ -205,10 +212,11 @@  static void btmtk_usb_cap_init(struct btmtk_usb_data *data)
 		ret = request_firmware(&firmware, MT7662_FIRMWARE, &udev->dev);
 		if (ret < 0) {
 			if (ret == -ENOENT) {
-				BT_ERR("Firmware file \"%s\" not found\n", MT7662_FIRMWARE);
+				BT_ERR("Firmware file \"%s\" not found\n",
+						MT7662_FIRMWARE);
 			} else {
 				BT_ERR("Firmware file \"%s\" request failed (err=%d)\n",
-					MT7662_FIRMWARE, ret);
+						MT7662_FIRMWARE, ret);
 			}
 		} else {
 		    BT_DBG("Firmware file \"%s\" Found\n", MT7662_FIRMWARE);
@@ -258,9 +266,9 @@  static int btmtk_usb_chk_crc(struct btmtk_usb_data *data, u32 checksum_len)
 	memmove(data->io_buf, &data->rom_patch_offset, 4);
 	memmove(&data->io_buf[4], &checksum_len, 4);
 
-	ret = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x1, DEVICE_VENDOR_REQUEST_IN,
-						  0x20, 0x00, data->io_buf, 8,
-						  CONTROL_TIMEOUT_JIFFIES);
+	ret = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x1,
+			DEVICE_VENDOR_REQUEST_IN, 0x20, 0x00, data->io_buf, 8,
+			CONTROL_TIMEOUT_JIFFIES);
 
 	if (ret < 0) {
 		BT_ERR("%s error(%d)\n", __func__, ret);
@@ -318,8 +326,8 @@  static int btmtk_usb_reset_wmt(struct btmtk_usb_data *data)
 	BT_DBG("%s\n", __func__);
 
 	ret = usb_control_msg(data->udev, usb_sndctrlpipe(data->udev, 0), 0x01,
-				DEVICE_CLASS_REQUEST_OUT, 0x12, 0x00, data->io_buf,
-				8, CONTROL_TIMEOUT_JIFFIES);
+				DEVICE_CLASS_REQUEST_OUT, 0x12, 0x00,
+				data->io_buf, 8, CONTROL_TIMEOUT_JIFFIES);
 
 	if (ret)
 		BT_ERR("%s:(%d)\n", __func__, ret);
@@ -350,7 +358,8 @@  static int btmtk_usb_load_rom_patch(struct btmtk_usb_data *data)
 	unsigned char phase;
 	void *buf;
 	char *pos;
-	unsigned int pipe = usb_sndbulkpipe(data->udev, data->bulk_tx_ep->bEndpointAddress);
+	unsigned int pipe = usb_sndbulkpipe(data->udev,
+			data->bulk_tx_ep->bEndpointAddress);
 
 	if (!data->firmware) {
 		BT_ERR("%s:please assign a rom patch\n", __func__);
@@ -391,7 +400,8 @@  load_patch_protect:
 		goto error0;
 	}
 
-	buf = usb_alloc_coherent(data->udev, UPLOAD_PATCH_UNIT, GFP_ATOMIC, &data_dma);
+	buf = usb_alloc_coherent(data->udev, UPLOAD_PATCH_UNIT, GFP_ATOMIC,
+			&data_dma);
 
 	if (!buf) {
 		ret = -ENOMEM;
@@ -409,7 +419,8 @@  load_patch_protect:
 	/* loading rom patch */
 	while (1) {
 		s32 sent_len_max = UPLOAD_PATCH_UNIT - PATCH_HEADER_SIZE;
-		sent_len = (patch_len - cur_len) >= sent_len_max ? sent_len_max : (patch_len - cur_len);
+		sent_len = (patch_len - cur_len) >= sent_len_max ?
+			sent_len_max : (patch_len - cur_len);
 
 		BT_DBG("patch_len = %d\n", patch_len);
 		BT_DBG("cur_len = %d\n", cur_len);
@@ -442,7 +453,8 @@  load_patch_protect:
 
 			pos[8] = phase;
 
-			memcpy(&pos[9], data->firmware->data + PATCH_INFO_SIZE + cur_len, sent_len);
+			memcpy(&pos[9], data->firmware->data + PATCH_INFO_SIZE +
+					cur_len, sent_len);
 
 			BT_DBG("sent_len + PATCH_HEADER_SIZE = %d, phase = %d\n",
 					sent_len + PATCH_HEADER_SIZE, phase);
@@ -463,7 +475,8 @@  load_patch_protect:
 			if (ret)
 				goto error2;
 
-			if (!wait_for_completion_timeout(&sent_to_mcu_done, msecs_to_jiffies(1000))) {
+			if (!wait_for_completion_timeout(&sent_to_mcu_done,
+						msecs_to_jiffies(1000))) {
 				usb_kill_urb(urb);
 				BT_ERR("upload rom_patch timeout\n");
 				goto error2;
@@ -480,7 +493,8 @@  load_patch_protect:
 		}
 	}
 
-	total_checksum = checksume16((u8 *)data->firmware->data + PATCH_INFO_SIZE, patch_len);
+	total_checksum = checksume16((u8 *)data->firmware->data +
+			PATCH_INFO_SIZE, patch_len);
 
 	BT_DBG("Send checksum req..\n");
 
@@ -520,7 +534,8 @@  static int load_fw_iv(struct btmtk_usb_data *data)
 	memmove(buf, data->firmware->data + 32, 64);
 
 	ret = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x01,
-						  DEVICE_VENDOR_REQUEST_OUT, 0x12, 0x0, buf, 64,
+						  DEVICE_VENDOR_REQUEST_OUT,
+						  0x12, 0x0, buf, 64,
 						  CONTROL_TIMEOUT_JIFFIES);
 
 	if (ret < 0) {
@@ -559,7 +574,8 @@  static int btmtk_usb_load_fw(struct btmtk_usb_data *data)
 	dma_addr_t data_dma;
 	int ret = 0, sent_len;
 	struct completion sent_to_mcu_done;
-	unsigned int pipe = usb_sndbulkpipe(data->udev, data->bulk_tx_ep->bEndpointAddress);
+	unsigned int pipe = usb_sndbulkpipe(data->udev,
+			data->bulk_tx_ep->bEndpointAddress);
 
 	if (!data->firmware) {
 		BT_ERR("%s:please assign a fw\n", __func__);
@@ -598,9 +614,11 @@  loadfw_protect:
 			| (*(data->firmware->data + 5) << 8)
 			| (*(data->firmware->data + 4));
 
-	fw_ver = (*(data->firmware->data + 11) << 8) | (*(data->firmware->data + 10));
+	fw_ver = (*(data->firmware->data + 11) << 8) |
+	      (*(data->firmware->data + 10));
 
-	build_ver = (*(data->firmware->data + 9) << 8) | (*(data->firmware->data + 8));
+	build_ver = (*(data->firmware->data + 9) << 8) |
+		(*(data->firmware->data + 8));
 
 	BT_DBG("fw version:%d.%d.%02d ",
 			(fw_ver & 0xf000) >> 8,
@@ -657,7 +675,8 @@  loadfw_protect:
 
 	/* Loading ILM */
 	while (1) {
-		sent_len = (ilm_len - cur_len) >= 14336 ? 14336 : (ilm_len - cur_len);
+		sent_len = (ilm_len - cur_len) >= 14336 ? 14336 :
+			(ilm_len - cur_len);
 
 		if (sent_len > 0) {
 			packet_header &= ~(0xffffffff);
@@ -665,7 +684,9 @@  loadfw_protect:
 			packet_header = cpu_to_le32(packet_header);
 
 			memmove(buf, &packet_header, 4);
-			memmove(buf + 4, data->firmware->data + 32 + cur_len, sent_len);
+			memmove(buf + 4, data->firmware->data + 32 + cur_len,
+					sent_len);
+
 
 			/* U2M_PDMA descriptor */
 			btmtk_usb_io_write32(data, 0x230, cur_len);
@@ -693,7 +714,8 @@  loadfw_protect:
 			if (ret)
 				goto error3;
 
-			if (!wait_for_completion_timeout(&sent_to_mcu_done, msecs_to_jiffies(1000))) {
+			if (!wait_for_completion_timeout(&sent_to_mcu_done,
+						msecs_to_jiffies(1000))) {
 				usb_kill_urb(urb);
 				BT_ERR("upload ilm fw timeout\n");
 				goto error3;
@@ -714,7 +736,8 @@  loadfw_protect:
 
 	/* Loading DLM */
 	while (1) {
-		sent_len = (dlm_len - cur_len) >= 14336 ? 14336 : (dlm_len - cur_len);
+		sent_len = (dlm_len - cur_len) >= 14336 ? 14336 :
+			(dlm_len - cur_len);
 
 		if (sent_len > 0) {
 			packet_header &= ~(0xffffffff);
@@ -722,7 +745,8 @@  loadfw_protect:
 			packet_header = cpu_to_le32(packet_header);
 
 			memmove(buf, &packet_header, 4);
-			memmove(buf + 4, data->firmware->data + 32 + ilm_len + cur_len, sent_len);
+			memmove(buf + 4, data->firmware->data + 32 + ilm_len +
+					cur_len, sent_len);
 
 			/* U2M_PDMA descriptor */
 			btmtk_usb_io_write32(data, 0x230, 0x80000 + cur_len);
@@ -751,7 +775,8 @@  loadfw_protect:
 			if (ret)
 				goto error3;
 
-			if (!wait_for_completion_timeout(&sent_to_mcu_done, msecs_to_jiffies(1000))) {
+			if (!wait_for_completion_timeout(&sent_to_mcu_done,
+						msecs_to_jiffies(1000))) {
 				usb_kill_urb(urb);
 				BT_ERR("upload dlm fw timeout\n");
 				goto error3;
@@ -978,8 +1003,8 @@  static int btmtk_usb_submit_bulk_in_urb(struct hci_dev *hdev, gfp_t mem_flags)
 
 	pipe = usb_rcvbulkpipe(data->udev, data->bulk_rx_ep->bEndpointAddress);
 
-	usb_fill_bulk_urb(urb, data->udev, pipe,
-					buf, size, btmtk_usb_bulk_in_complete, hdev);
+	usb_fill_bulk_urb(urb, data->udev, pipe, buf, size,
+			btmtk_usb_bulk_in_complete, hdev);
 
 	urb->transfer_flags |= URB_FREE_BUFFER;
 
@@ -1015,7 +1040,8 @@  static void btmtk_usb_isoc_in_complete(struct urb *urb)
 	if (urb->status == 0) {
 		for (i = 0; i < urb->number_of_packets; i++) {
 			unsigned int offset = urb->iso_frame_desc[i].offset;
-			unsigned int length = urb->iso_frame_desc[i].actual_length;
+			unsigned int length =
+				urb->iso_frame_desc[i].actual_length;
 
 			if (urb->iso_frame_desc[i].status)
 				continue;
@@ -1096,8 +1122,9 @@  static int btmtk_usb_submit_isoc_in_urb(struct hci_dev *hdev, gfp_t mem_flags)
 
 	pipe = usb_rcvisocpipe(data->udev, data->isoc_rx_ep->bEndpointAddress);
 
-	usb_fill_int_urb(urb, data->udev, pipe, buf, size, btmtk_usb_isoc_in_complete,
-				hdev, data->isoc_rx_ep->bInterval);
+	usb_fill_int_urb(urb, data->udev, pipe, buf, size,
+			btmtk_usb_isoc_in_complete, hdev,
+			data->isoc_rx_ep->bInterval);
 
 	urb->transfer_flags  = URB_FREE_BUFFER | URB_ISO_ASAP;
 
@@ -1306,7 +1333,8 @@  static int btmtk_usb_send_frame(struct sk_buff *skb)
 		}
 
 		usb_fill_control_urb(urb, data->udev, pipe, (void *) dr,
-				skb->data, skb->len, btmtk_usb_tx_complete, skb);
+				skb->data, skb->len, btmtk_usb_tx_complete,
+				skb);
 
 		hdev->stat.cmd_tx++;
 		break;
@@ -1322,8 +1350,8 @@  static int btmtk_usb_send_frame(struct sk_buff *skb)
 		pipe = usb_sndbulkpipe(data->udev,
 					data->bulk_tx_ep->bEndpointAddress);
 
-		usb_fill_bulk_urb(urb, data->udev, pipe,
-				skb->data, skb->len, btmtk_usb_tx_complete, skb);
+		usb_fill_bulk_urb(urb, data->udev, pipe, skb->data, skb->len,
+				btmtk_usb_tx_complete, skb);
 
 		hdev->stat.acl_tx++;
 		BT_DBG("HCI_ACLDATA_PKT:\n");
@@ -1442,7 +1470,8 @@  static inline int __set_isoc_interface(struct hci_dev *hdev, int altsetting)
 
 static void btmtk_usb_work(struct work_struct *work)
 {
-	struct btmtk_usb_data *data = container_of(work, struct btmtk_usb_data, work);
+	struct btmtk_usb_data *data = container_of(work, struct btmtk_usb_data,
+			work);
 	struct hci_dev *hdev = data->hdev;
 	int new_alts;
 	int err;
@@ -1451,7 +1480,8 @@  static void btmtk_usb_work(struct work_struct *work)
 
 	if (hdev->conn_hash.sco_num > 0) {
 		if (!test_bit(BTUSB_DID_ISO_RESUME, &data->flags)) {
-			err = usb_autopm_get_interface(data->isoc ? data->isoc : data->intf);
+			err = usb_autopm_get_interface(data->isoc ? data->isoc :
+					data->intf);
 			if (err < 0) {
 				clear_bit(BTUSB_ISOC_RUNNING, &data->flags);
 				usb_kill_anchored_urbs(&data->isoc_anchor);
@@ -1489,13 +1519,15 @@  static void btmtk_usb_work(struct work_struct *work)
 		__set_isoc_interface(hdev, 0);
 
 		if (test_and_clear_bit(BTUSB_DID_ISO_RESUME, &data->flags))
-			 usb_autopm_put_interface(data->isoc ? data->isoc : data->intf);
+			 usb_autopm_put_interface(data->isoc ? data->isoc :
+					 data->intf);
 	}
 }
 
 static void btmtk_usb_waker(struct work_struct *work)
 {
-	struct btmtk_usb_data *data = container_of(work, struct btmtk_usb_data, waker);
+	struct btmtk_usb_data *data = container_of(work, struct btmtk_usb_data,
+			waker);
 	int err;
 
 	err = usb_autopm_get_interface(data->intf);