mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Wayne Porter <wporter82@gmail.com>
To: gregkh@linuxfoundation.org
Cc: Wayne Porter <wporter82@gmail.com>, linux-kernel@vger.kernel.org
Subject: [PATCH 38/45] staging: rts5208: ms.c: Long Lines
Date: Tue, 11 Oct 2016 21:56:54 +0000	[thread overview]
Message-ID: <7b2e43f1ba3c44c587d89d5c392a926e9170f366.1476222675.git.wporter82@gmail.com> (raw)
In-Reply-To: <cover.1476222674.git.wporter82@gmail.com>
In-Reply-To: <cover.1476222674.git.wporter82@gmail.com>

Fix long lines detected by checkpatch

Signed-off-by: Wayne Porter <wporter82@gmail.com>
---
 drivers/staging/rts5208/ms.c | 94 +++++++++++++++++++++++++++++---------------
 1 file changed, 63 insertions(+), 31 deletions(-)

diff --git a/drivers/staging/rts5208/ms.c b/drivers/staging/rts5208/ms.c
index c8ecdf6..0573d80 100644
--- a/drivers/staging/rts5208/ms.c
+++ b/drivers/staging/rts5208/ms.c
@@ -432,31 +432,36 @@ static int ms_pull_ctl_disable(struct rtsx_chip *chip)
 
 	if (CHECK_PID(chip, 0x5208)) {
 		retval = rtsx_write_register(chip, CARD_PULL_CTL1, 0xFF,
-					     MS_D1_PD | MS_D2_PD | MS_CLK_PD | MS_D6_PD);
+					     MS_D1_PD | MS_D2_PD | MS_CLK_PD |
+					     MS_D6_PD);
 		if (retval) {
 			rtsx_trace(chip);
 			return retval;
 		}
 		retval = rtsx_write_register(chip, CARD_PULL_CTL2, 0xFF,
-					     MS_D3_PD | MS_D0_PD | MS_BS_PD | XD_D4_PD);
+					     MS_D3_PD | MS_D0_PD | MS_BS_PD |
+					     XD_D4_PD);
 		if (retval) {
 			rtsx_trace(chip);
 			return retval;
 		}
 		retval = rtsx_write_register(chip, CARD_PULL_CTL3, 0xFF,
-					     MS_D7_PD | XD_CE_PD | XD_CLE_PD | XD_CD_PU);
+					     MS_D7_PD | XD_CE_PD | XD_CLE_PD |
+					     XD_CD_PU);
 		if (retval) {
 			rtsx_trace(chip);
 			return retval;
 		}
 		retval = rtsx_write_register(chip, CARD_PULL_CTL4, 0xFF,
-					     XD_RDY_PD | SD_D3_PD | SD_D2_PD | XD_ALE_PD);
+					     XD_RDY_PD | SD_D3_PD | SD_D2_PD |
+					     XD_ALE_PD);
 		if (retval) {
 			rtsx_trace(chip);
 			return retval;
 		}
 		retval = rtsx_write_register(chip, CARD_PULL_CTL5, 0xFF,
-					     MS_INS_PU | SD_WP_PD | SD_CD_PU | SD_CMD_PD);
+					     MS_INS_PU | SD_WP_PD | SD_CD_PU |
+					     SD_CMD_PD);
 		if (retval) {
 			rtsx_trace(chip);
 			return retval;
@@ -616,14 +621,20 @@ static int ms_prepare_reset(struct rtsx_chip *chip)
 
 	if (chip->asic_code) {
 		retval = rtsx_write_register(chip, MS_CFG, 0xFF,
-					     SAMPLE_TIME_RISING | PUSH_TIME_DEFAULT | NO_EXTEND_TOGGLE | MS_BUS_WIDTH_1);
+					     SAMPLE_TIME_RISING |
+					     PUSH_TIME_DEFAULT |
+					     NO_EXTEND_TOGGLE |
+					     MS_BUS_WIDTH_1);
 		if (retval) {
 			rtsx_trace(chip);
 			return retval;
 		}
 	} else {
 		retval = rtsx_write_register(chip, MS_CFG, 0xFF,
-					     SAMPLE_TIME_FALLING | PUSH_TIME_DEFAULT | NO_EXTEND_TOGGLE | MS_BUS_WIDTH_1);
+					     SAMPLE_TIME_FALLING |
+					     PUSH_TIME_DEFAULT |
+					     NO_EXTEND_TOGGLE |
+					     MS_BUS_WIDTH_1);
 		if (retval) {
 			rtsx_trace(chip);
 			return retval;
@@ -2375,7 +2386,9 @@ static int reset_ms(struct rtsx_chip *chip)
 
 		retval = rtsx_write_register(chip, MS_CFG,
 					     0x58 | MS_NO_CHECK_INT,
-					     MS_BUS_WIDTH_4 | PUSH_TIME_ODD | MS_NO_CHECK_INT);
+					     MS_BUS_WIDTH_4 |
+					     PUSH_TIME_ODD |
+					     MS_NO_CHECK_INT);
 		if (retval) {
 			rtsx_trace(chip);
 			return retval;
@@ -2999,12 +3012,13 @@ static int mspro_rw_multi_sector(struct scsi_cmnd *srb,
 	}
 
 	if (ms_card->seq_mode) {
-		if ((ms_card->pre_dir != srb->sc_data_direction)
-				|| ((ms_card->pre_sec_addr + ms_card->pre_sec_cnt) != start_sector)
-				|| (mode_2k && (ms_card->seq_mode & MODE_512_SEQ))
-				|| (!mode_2k && (ms_card->seq_mode & MODE_2K_SEQ))
-				|| !(val & MS_INT_BREQ)
-				|| ((ms_card->total_sec_cnt + sector_cnt) > 0xFE00)) {
+		if ((ms_card->pre_dir != srb->sc_data_direction) ||
+		    ((ms_card->pre_sec_addr + ms_card->pre_sec_cnt) !=
+		     start_sector) ||
+		    (mode_2k && (ms_card->seq_mode & MODE_512_SEQ)) ||
+		    (!mode_2k && (ms_card->seq_mode & MODE_2K_SEQ)) ||
+		    !(val & MS_INT_BREQ) ||
+		    ((ms_card->total_sec_cnt + sector_cnt) > 0xFE00)) {
 			ms_card->seq_mode = 0;
 			ms_card->total_sec_cnt = 0;
 			if (val & MS_INT_BREQ) {
@@ -3014,7 +3028,8 @@ static int mspro_rw_multi_sector(struct scsi_cmnd *srb,
 					return STATUS_FAIL;
 				}
 
-				rtsx_write_register(chip, RBCTL, RB_FLUSH, RB_FLUSH);
+				rtsx_write_register(chip, RBCTL, RB_FLUSH,
+						    RB_FLUSH);
 			}
 		}
 	}
@@ -3109,7 +3124,8 @@ static int mspro_read_format_progress(struct rtsx_chip *chip,
 	}
 
 	if (!(tmp & MS_INT_BREQ)) {
-		if ((tmp & (MS_INT_CED | MS_INT_BREQ | MS_INT_CMDNK | MS_INT_ERR)) == MS_INT_CED) {
+		if ((tmp & (MS_INT_CED | MS_INT_BREQ | MS_INT_CMDNK |
+			    MS_INT_ERR)) == MS_INT_CED) {
 			ms_card->format_status = FORMAT_SUCCESS;
 			return STATUS_SUCCESS;
 		}
@@ -3396,11 +3412,17 @@ static int ms_read_multiple_pages(struct rtsx_chip *chip, u16 phy_blk,
 				if (retval != STATUS_SUCCESS) {
 					if (!(chip->card_wp & MS_CARD)) {
 						reset_ms(chip);
-						ms_set_page_status(log_blk, setPS_NG, extra, MS_EXTRA_SIZE);
-						ms_write_extra_data(chip, phy_blk,
-								page_addr, extra, MS_EXTRA_SIZE);
+						ms_set_page_status
+							(log_blk, setPS_NG,
+							 extra,
+							 MS_EXTRA_SIZE);
+						ms_write_extra_data
+							(chip, phy_blk,
+							 page_addr, extra,
+							 MS_EXTRA_SIZE);
 					}
-					ms_set_err_code(chip, MS_FLASH_READ_ERROR);
+					ms_set_err_code(chip,
+							MS_FLASH_READ_ERROR);
 					rtsx_trace(chip);
 					return STATUS_FAIL;
 				}
@@ -3883,8 +3905,9 @@ static int ms_rw_multi_sector(struct scsi_cmnd *srb, struct rtsx_chip *chip,
 				return STATUS_FAIL;
 			}
 #endif
-			old_blk = ms_get_l2p_tbl(chip, seg_no,
-						log_blk - ms_start_idx[seg_no]);
+			old_blk = ms_get_l2p_tbl
+					(chip, seg_no,
+					 log_blk - ms_start_idx[seg_no]);
 			new_blk  = ms_get_unused_block(chip, seg_no);
 			if ((old_blk == 0xFFFF) || (new_blk == 0xFFFF)) {
 				set_sense_type(chip, lun,
@@ -3896,8 +3919,10 @@ static int ms_rw_multi_sector(struct scsi_cmnd *srb, struct rtsx_chip *chip,
 			retval = ms_prepare_write(chip, old_blk, new_blk,
 						  log_blk, start_page);
 			if (retval != STATUS_SUCCESS) {
-				if (detect_card_cd(chip, MS_CARD) != STATUS_SUCCESS) {
-					set_sense_type(chip, lun,
+				if (detect_card_cd(chip, MS_CARD) !=
+				    STATUS_SUCCESS) {
+					set_sense_type
+						(chip, lun,
 						SENSE_TYPE_MEDIA_NOT_PRESENT);
 					rtsx_trace(chip);
 					return STATUS_FAIL;
@@ -4048,8 +4073,10 @@ static int ms_rw_multi_sector(struct scsi_cmnd *srb, struct rtsx_chip *chip,
 			retval = ms_finish_write(chip, old_blk, new_blk,
 						 log_blk, end_page);
 			if (retval != STATUS_SUCCESS) {
-				if (detect_card_cd(chip, MS_CARD) != STATUS_SUCCESS) {
-					set_sense_type(chip, lun,
+				if (detect_card_cd(chip, MS_CARD) !=
+				    STATUS_SUCCESS) {
+					set_sense_type
+						(chip, lun,
 						SENSE_TYPE_MEDIA_NOT_PRESENT);
 					rtsx_trace(chip);
 					return STATUS_FAIL;
@@ -4627,7 +4654,8 @@ int mg_set_ICV(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 	if (retval != STATUS_SUCCESS) {
 		if (ms_card->mg_auth == 0) {
 			if ((buf[5] & 0xC0) != 0)
-				set_sense_type(chip, lun,
+				set_sense_type
+					(chip, lun,
 					SENSE_TYPE_MG_KEY_FAIL_NOT_ESTAB);
 			else
 				set_sense_type(chip, lun,
@@ -4666,7 +4694,9 @@ int mg_set_ICV(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 			rtsx_clear_ms_error(chip);
 			if (ms_card->mg_auth == 0) {
 				if ((buf[5] & 0xC0) != 0)
-					set_sense_type(chip, lun, SENSE_TYPE_MG_KEY_FAIL_NOT_ESTAB);
+					set_sense_type
+					    (chip, lun,
+					     SENSE_TYPE_MG_KEY_FAIL_NOT_ESTAB);
 				else
 					set_sense_type(chip, lun,
 						       SENSE_TYPE_MG_WRITE_ERR);
@@ -4686,8 +4716,9 @@ int mg_set_ICV(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 		rtsx_clear_ms_error(chip);
 		if (ms_card->mg_auth == 0) {
 			if ((buf[5] & 0xC0) != 0)
-				set_sense_type(chip, lun,
-					SENSE_TYPE_MG_KEY_FAIL_NOT_ESTAB);
+				set_sense_type
+				    (chip, lun,
+				     SENSE_TYPE_MG_KEY_FAIL_NOT_ESTAB);
 			else
 				set_sense_type(chip, lun,
 					       SENSE_TYPE_MG_WRITE_ERR);
@@ -4722,7 +4753,8 @@ void ms_cleanup_work(struct rtsx_chip *chip)
 		}
 	}
 #ifdef MS_DELAY_WRITE
-	else if ((!CHK_MSPRO(ms_card)) && ms_card->delay_write.delay_write_flag) {
+	else if ((!CHK_MSPRO(ms_card)) &&
+		 ms_card->delay_write.delay_write_flag) {
 		dev_dbg(rtsx_dev(chip), "MS: delay write\n");
 		ms_delay_write(chip);
 		ms_card->cleanup_counter = 0;
-- 
2.1.4

  parent reply	other threads:[~2016-10-11 22:00 UTC|newest]

Thread overview: 46+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-10-11 21:56 [PATCH 00/45] staging: rts5208: Checkpatch.pl cleanup Wayne Porter
2016-10-11 21:56 ` [PATCH 01/45] staging: rts5208: spi.c: Remove unnecessary parenthesis Wayne Porter
2016-10-11 21:56 ` [PATCH 02/45] staging: rts5208: spi.c: Alignment fixes Wayne Porter
2016-10-11 21:56 ` [PATCH 03/45] staging: rts5208: sd.h: " Wayne Porter
2016-10-11 21:56 ` [PATCH 04/45] staging: rts5208: sd.c: Remove unnecessary parentheses Wayne Porter
2016-10-11 21:56 ` [PATCH 05/45] staging: rts5208: sd.c: Alignment fixes Wayne Porter
2016-10-11 21:56 ` [PATCH 06/45] staging: rts5208: sd.c: Long line fixes Wayne Porter
2016-10-11 21:56 ` [PATCH 07/45] staging: rts5208: sd.c: CamelCase fixes Wayne Porter
2016-10-11 21:56 ` [PATCH 08/45] staging: rts5208: sd.c: Fix logical continuations Wayne Porter
2016-10-11 21:56 ` [PATCH 09/45] staging: rts5208: sd.c: Spacing cleanup Wayne Porter
2016-10-11 21:56 ` [PATCH 10/45] staging: rts5208: Alignment fixes Wayne Porter
2016-10-11 21:56 ` [PATCH 11/45] staging: rts5208: Unnecessary parentheses cleanup Wayne Porter
2016-10-11 21:56 ` [PATCH 12/45] staging: rts5208: Alignment fix Wayne Porter
2016-10-11 21:56 ` [PATCH 13/45] staging: rts5208: Fix typo in function name Wayne Porter
2016-10-11 21:56 ` [PATCH 14/45] staging: rts5208: Alignment fixes Wayne Porter
2016-10-11 21:56 ` [PATCH 15/45] staging: rts5208: Remove parentheses Wayne Porter
2016-10-11 21:56 ` [PATCH 16/45] staging: rts5208: CamelCase fixes Wayne Porter
2016-10-11 21:56 ` [PATCH 17/45] staging: rts5208: Remove multiple assignment Wayne Porter
2016-10-11 21:56 ` [PATCH 18/45] staging: rts5208: Add braces to if() Wayne Porter
2016-10-11 21:56 ` [PATCH 19/45] staging: rts5208: Add space around operator Wayne Porter
2016-10-11 21:56 ` [PATCH 20/45] staging: rts5208: Alignment fixes Wayne Porter
2016-10-11 21:56 ` [PATCH 21/45] staging: rts5208: Long lines fixes Wayne Porter
2016-10-11 21:56 ` [PATCH 22/45] staging: rts5208: Prefer using BIT macro Wayne Porter
2016-10-11 21:56 ` [PATCH 23/45] staging: rts5208: Parenthesis alignment Wayne Porter
2016-10-11 21:56 ` [PATCH 24/45] staging: rts5208: Unecessary parantheses Wayne Porter
2016-10-11 21:56 ` [PATCH 25/45] staging: rts5208: Parenthesis alignment Wayne Porter
2016-10-11 21:56 ` [PATCH 26/45] staging: rts5208: Unnecessary parentheses Wayne Porter
2016-10-11 21:56 ` [PATCH 27/45] staging: rts5208: Spacing Wayne Porter
2016-10-11 21:56 ` [PATCH 28/45] staging: rts5208: Comparison to NULL Wayne Porter
2016-10-11 21:56 ` [PATCH 29/45] staging: rts5208: rtsx.c: Unnecessary parentheses Wayne Porter
2016-10-11 21:56 ` [PATCH 30/45] staging: rts5208: rtsx.c: Alignment Wayne Porter
2016-10-11 21:56 ` [PATCH 31/45] staging: rts5208: rtsx.c: Multiple assignments Wayne Porter
2016-10-11 21:56 ` [PATCH 32/45] staging: rts5208: rtsx.c: Spacing Wayne Porter
2016-10-11 21:56 ` [PATCH 33/45] staging: rts5208: rtsx.c: CamelCase Wayne Porter
2016-10-11 21:56 ` [PATCH 34/45] staging: rts5208: rtsx.c: Spacing Wayne Porter
2016-10-11 21:56 ` [PATCH 35/45] staging: rts5208: rtsx.c: Alloc sizeof struct Wayne Porter
2016-10-11 21:56 ` [PATCH 36/45] staging: rts5208: ms.h: Parenthesis alignment Wayne Porter
2016-10-11 21:56 ` [PATCH 37/45] staging: rts5208: ms.c: " Wayne Porter
2016-10-11 21:56 ` Wayne Porter [this message]
2016-10-11 21:56 ` [PATCH 39/45] staging: rts5208: ms.c: Multiple assignments Wayne Porter
2016-10-11 21:56 ` [PATCH 40/45] staging: rts5208: ms.c: Braces fix Wayne Porter
2016-10-11 21:56 ` [PATCH 41/45] staging: rts5208: CamelCase fix Wayne Porter
2016-10-11 21:56 ` [PATCH 42/45] staging: rts5208: rtsx_scsi.h: Long lines Wayne Porter
2016-10-11 21:56 ` [PATCH 43/45] staging: rts5208: rtxs_chip.h: " Wayne Porter
2016-10-11 21:57 ` [PATCH 44/45] staging: rts5208: rtsx_chip.c: " Wayne Porter
2016-10-11 21:57 ` [PATCH 45/45] staging: rts5208: rtsx.c: Alignment fix Wayne Porter

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=7b2e43f1ba3c44c587d89d5c392a926e9170f366.1476222675.git.wporter82@gmail.com \
    --to=wporter82@gmail.com \
    --cc=gregkh@linuxfoundation.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: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®