public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/2] staging: rts5139: rts51x_card: fixed brace coding style issue
  2012-07-17  2:52 staging: rts5139: rts51x_card: coding style fix Erik Jones
@ 2012-07-17  2:52 ` Erik Jones
  0 siblings, 0 replies; 4+ messages in thread
From: Erik Jones @ 2012-07-17  2:52 UTC (permalink / raw)
  To: gregkh; +Cc: edwin_rong, dan.carpenter, devel, linux-kernel, Erik Jones

Fixed a coding style issue.

Signed-off-by: Erik Jones <erik@ejnode.com>
---
 drivers/staging/rts5139/rts51x_card.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/rts5139/rts51x_card.c b/drivers/staging/rts5139/rts51x_card.c
index 4192c3b..a3cb559 100644
--- a/drivers/staging/rts5139/rts51x_card.c
+++ b/drivers/staging/rts5139/rts51x_card.c
@@ -211,13 +211,12 @@ static void card_cd_debounce(struct rts51x_chip *chip, u8 *need_reset,
 				release_map |= MS_CARD;
 		}
 	} else {
-		if (chip->card_status & XD_CD) {
+		if (chip->card_status & XD_CD)
 			reset_map |= XD_CARD;
-		} else if (chip->card_status & SD_CD) {
+		else if (chip->card_status & SD_CD)
 			reset_map |= SD_CARD;
-		} else if (chip->card_status & MS_CD) {
+		else if (chip->card_status & MS_CD)
 			reset_map |= MS_CARD;
-		}
 	}
 
 	if (CHECK_PKG(chip, QFN24) && reset_map) {
-- 
1.7.9.5


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [RESEND PATCH 0] staging: rts5139: rts51x_card: coding style fix
@ 2012-07-17  3:51 Erik Jones
  2012-07-17  3:51 ` [PATCH 1/2] staging: rts5139: rts51x_card: fixed brace coding style issue Erik Jones
  2012-07-17  3:51 ` [PATCH 2/2] " Erik Jones
  0 siblings, 2 replies; 4+ messages in thread
From: Erik Jones @ 2012-07-17  3:51 UTC (permalink / raw)
  To: gregkh; +Cc: edwin_rong, dan.carpenter, devel, linux-kernel

I am resending this patch-set because the initial version's
subject didn't include [PATCH 0].

This patch-set fixes coding style issues in rts51x_card driver.
Issues were found with scripts/checkpatch.pl tool.

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH 1/2] staging: rts5139: rts51x_card: fixed brace coding style issue
  2012-07-17  3:51 [RESEND PATCH 0] staging: rts5139: rts51x_card: coding style fix Erik Jones
@ 2012-07-17  3:51 ` Erik Jones
  2012-07-17  3:51 ` [PATCH 2/2] " Erik Jones
  1 sibling, 0 replies; 4+ messages in thread
From: Erik Jones @ 2012-07-17  3:51 UTC (permalink / raw)
  To: gregkh; +Cc: edwin_rong, dan.carpenter, devel, linux-kernel, Erik Jones

Fixed a coding style issue.

Signed-off-by: Erik Jones <erik@ejnode.com>
---
 drivers/staging/rts5139/rts51x_card.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/rts5139/rts51x_card.c b/drivers/staging/rts5139/rts51x_card.c
index 4192c3b..a3cb559 100644
--- a/drivers/staging/rts5139/rts51x_card.c
+++ b/drivers/staging/rts5139/rts51x_card.c
@@ -211,13 +211,12 @@ static void card_cd_debounce(struct rts51x_chip *chip, u8 *need_reset,
 				release_map |= MS_CARD;
 		}
 	} else {
-		if (chip->card_status & XD_CD) {
+		if (chip->card_status & XD_CD)
 			reset_map |= XD_CARD;
-		} else if (chip->card_status & SD_CD) {
+		else if (chip->card_status & SD_CD)
 			reset_map |= SD_CARD;
-		} else if (chip->card_status & MS_CD) {
+		else if (chip->card_status & MS_CD)
 			reset_map |= MS_CARD;
-		}
 	}
 
 	if (CHECK_PKG(chip, QFN24) && reset_map) {
-- 
1.7.9.5


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [PATCH 2/2] staging: rts5139: rts51x_card: fixed brace coding style issue
  2012-07-17  3:51 [RESEND PATCH 0] staging: rts5139: rts51x_card: coding style fix Erik Jones
  2012-07-17  3:51 ` [PATCH 1/2] staging: rts5139: rts51x_card: fixed brace coding style issue Erik Jones
@ 2012-07-17  3:51 ` Erik Jones
  1 sibling, 0 replies; 4+ messages in thread
From: Erik Jones @ 2012-07-17  3:51 UTC (permalink / raw)
  To: gregkh; +Cc: edwin_rong, dan.carpenter, devel, linux-kernel, Erik Jones

Fixed a coding style issue. An else statement was
not on the same line as the preceding if statement's
closing brace.

Signed-off-by: Erik Jones <erik@ejnode.com>
---
 drivers/staging/rts5139/rts51x_card.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/rts5139/rts51x_card.c b/drivers/staging/rts5139/rts51x_card.c
index a3cb559..50be42a 100644
--- a/drivers/staging/rts5139/rts51x_card.c
+++ b/drivers/staging/rts5139/rts51x_card.c
@@ -826,8 +826,7 @@ int card_power_on(struct rts51x_chip *chip, u8 card)
 	if ((card == SD_CARD) || (card == XD_CARD)) {
 		RTS51X_WRITE_REG(chip, CARD_PWR_CTL, mask | LDO3318_PWR_MASK,
 				 val1 | LDO_SUSPEND);
-	}
-	else {
+	} else {
 #endif
 		RTS51X_WRITE_REG(chip, CARD_PWR_CTL, mask, val1);
 #ifdef SD_XD_IO_FOLLOW_PWR
-- 
1.7.9.5


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2012-07-17  3:55 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-17  3:51 [RESEND PATCH 0] staging: rts5139: rts51x_card: coding style fix Erik Jones
2012-07-17  3:51 ` [PATCH 1/2] staging: rts5139: rts51x_card: fixed brace coding style issue Erik Jones
2012-07-17  3:51 ` [PATCH 2/2] " Erik Jones
  -- strict thread matches above, loose matches on Subject: below --
2012-07-17  2:52 staging: rts5139: rts51x_card: coding style fix Erik Jones
2012-07-17  2:52 ` [PATCH 1/2] staging: rts5139: rts51x_card: fixed brace coding style issue Erik Jones

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox