2012-10-18 16:08:09

by Sangho Yi

Subject: [PATCH 1/3] drivers: mmc: core: sdio.c: fixed lines with > 80 chars

Fixed coding style warning cases for exceeding 80 chars per line on
sdio.c.

Signed-off-by: Sangho Yi <[email protected]>
---
drivers/mmc/core/sdio.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
index 2273ce6..14326e8 100644
--- a/drivers/mmc/core/sdio.c
+++ b/drivers/mmc/core/sdio.c
@@ -47,7 +47,8 @@ static int sdio_read_fbr(struct sdio_func *func)

if (data == 0x0f) {
ret = mmc_io_rw_direct(func->card, 0, 0,
- SDIO_FBR_BASE(func->num) + SDIO_FBR_STD_IF_EXT, 0, &data);
+ SDIO_FBR_BASE(func->num) + SDIO_FBR_STD_IF_EXT,
+ 0, &data);
if (ret)
goto out;
}
@@ -619,7 +620,8 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr,
card->type = MMC_TYPE_SD_COMBO;

if (oldcard && (oldcard->type != MMC_TYPE_SD_COMBO ||
- memcmp(card->raw_cid, oldcard->raw_cid, sizeof(card->raw_cid)) != 0)) {
+ memcmp(card->raw_cid, oldcard->raw_cid,
+ sizeof(card->raw_cid)) != 0)) {
mmc_remove_card(card);
return -ENOENT;
}
--
1.7.9.5

2012-10-18 16:08:12

by Sangho Yi

Subject: [PATCH 2/3] drivers: mmc: core: sdio.c: fixed coding style error on for() statement

add a whitespace after ";" on for statement, to follow a coding style guideline.

Signed-off-by: Sangho Yi <[email protected]>
---
drivers/mmc/core/sdio.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
index 14326e8..df09b63 100644
--- a/drivers/mmc/core/sdio.c
+++ b/drivers/mmc/core/sdio.c
@@ -819,7 +819,7 @@ static void mmc_sdio_remove(struct mmc_host *host)
BUG_ON(!host);
BUG_ON(!host->card);

- for (i = 0;i < host->card->sdio_funcs;i++) {
+ for (i = 0; i < host->card->sdio_funcs; i++) {
if (host->card->sdio_func[i]) {
sdio_remove_func(host->card->sdio_func[i]);
host->card->sdio_func[i] = NULL;
@@ -1151,7 +1151,7 @@ int mmc_attach_sdio(struct mmc_host *host)
/*
* ...then the SDIO functions.
*/
- for (i = 0;i < funcs;i++) {
+ for (i = 0; i < funcs; i++) {
err = sdio_add_func(host->card->sdio_func[i]);
if (err)
goto remove_added;
--
1.7.9.5

2012-10-18 16:08:16

by Sangho Yi

Subject: [PATCH 3/3] drivers: mmc: core: sdio.c: fixed from pr_warning(... to pr_warn(...

Replaced pr_warning(... to pr_warn(... on sdio.c

Signed-off-by: Sangho Yi <[email protected]>
---
drivers/mmc/core/sdio.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
index df09b63..889d3da 100644
--- a/drivers/mmc/core/sdio.c
+++ b/drivers/mmc/core/sdio.c
@@ -220,7 +220,7 @@ static int sdio_enable_wide(struct mmc_card *card)
return ret;

if ((ctrl & SDIO_BUS_WIDTH_MASK) == SDIO_BUS_WIDTH_RESERVED)
- pr_warning("%s: SDIO_CCCR_IF is invalid: 0x%02x\n",
+ pr_warn("%s: SDIO_CCCR_IF is invalid: 0x%02x\n",
mmc_hostname(card->host), ctrl);

/* set as 4-bit bus width */
@@ -1068,7 +1068,7 @@ int mmc_attach_sdio(struct mmc_host *host)
* support.
*/
if (ocr & 0x7F) {
- pr_warning("%s: card claims to support voltages "
+ pr_warn("%s: card claims to support voltages "
"below the defined range. These will be ignored.\n",
mmc_hostname(host));
ocr &= ~0x7F;
--
1.7.9.5

2012-10-18 16:10:38

by Philip Rakity

Subject: Re: [PATCH 2/3] drivers: mmc: core: sdio.c: fixed coding style error on for() statement

On 18 Oct 2012, at 17:06, Sangho Yi <[email protected]> wrote:

> add a whitespace after ";" on for statement, to follow a coding style guideline.
>
> Signed-off-by: Sangho Yi <[email protected]>
> ---
> drivers/mmc/core/sdio.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
> index 14326e8..df09b63 100644
> --- a/drivers/mmc/core/sdio.c
> +++ b/drivers/mmc/core/sdio.c
> @@ -819,7 +819,7 @@ static void mmc_sdio_remove(struct mmc_host *host)
> BUG_ON(!host);
> BUG_ON(!host->card);
>
> - for (i = 0;i < host->card->sdio_funcs;i++) {
> + for (i = 0; i < host->card->sdio_funcs; i++) {
> if (host->card->sdio_func[i]) {
> sdio_remove_func(host->card->sdio_func[i]);
> host->card->sdio_func[i] = NULL;
> @@ -1151,7 +1151,7 @@ int mmc_attach_sdio(struct mmc_host *host)
> /*
> * ...then the SDIO functions.
> */
> - for (i = 0;i < funcs;i++) {
> + for (i = 0; i < funcs; i++) {
> err = sdio_add_func(host->card->sdio_func[i]);
> if (err)
> goto remove_added;
> --
> 1.7.9.5
>
> --

Reviewed-by: Philip Rakity <[email protected]>

> To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html