staging: rts5139: rts51x_card: coding style fix

PATCH RESEND New Erik Jones 1 participant 3 messages Jul 17, 2012 Staging

lore

Share & tools

lore

Erik Jones

author

2012-07-17 03:55 UTC #0 lore raw

PATCH RESEND 1/1 staging: rts5139: rts51x_card: coding style fix

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.

Erik Jones

author

2012-07-17 03:55 UTC #1 lore raw

PATCH 1/2 staging: rts5139: rts51x_card: fixed brace coding style issue

Fixed a coding style issue.

Signed-off-by Erik Jones <[email protected]>

---
 drivers/staging/rts5139/rts51x_card.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

drivers/staging/rts5139/rts51x_card.c +3 -4

index 4192c3b..a3cb559 100644
@@ -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) {

Signature · 1 line

1.7.9.5

Erik Jones

author

2012-07-17 03:55 UTC #2 lore raw

PATCH 2/2 staging: rts5139: rts51x_card: fixed brace coding style issue

In reply to 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 <[email protected]>

---
 drivers/staging/rts5139/rts51x_card.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

drivers/staging/rts5139/rts51x_card.c +1 -2

index a3cb559..50be42a 100644
@@ -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

Signature · 1 line

1.7.9.5