iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mmc: usdhi6rol0: mark expected switch fall-throughs

Browse Source 
In preparation to enabling -Wimplicit-fallthrough, mark switch
cases where we are expecting to fall through.

This patch fixes the following warnings:

In file included from drivers/mmc/host/usdhi6rol0.c:9:
drivers/mmc/host/usdhi6rol0.c: In function ‘usdhi6_timeout_work’:
./include/linux/device.h:1483:2: warning: this statement may fall through [-Wimplicit-fallthrough=]
  _dev_err(dev, dev_fmt(fmt), ##__VA_ARGS__)
  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/mmc/host/usdhi6rol0.c:1689:3: note: in expansion of macro ‘dev_err’
   dev_err(mmc_dev(host->mmc), "Invalid state %u\n", host->wait);
   ^~~~~~~
drivers/mmc/host/usdhi6rol0.c:1691:2: note: here
  case USDHI6_WAIT_FOR_CMD:
  ^~~~
drivers/mmc/host/usdhi6rol0.c:1711:3: warning: this statement may fall through [-Wimplicit-fallthrough=]
   usdhi6_sg_unmap(host, true);
   ^~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/mmc/host/usdhi6rol0.c:1716:2: note: here
  case USDHI6_WAIT_FOR_DATA_END:
  ^~~~
  CC [M]  drivers/isdn/hisax/hisax_isac.o
drivers/mmc/host/usdhi6rol0.c: In function ‘usdhi6_stop_cmd’:
drivers/mmc/host/usdhi6rol0.c:1338:6: warning: this statement may fall through [-Wimplicit-fallthrough=]
   if (mrq->stop->opcode == MMC_STOP_TRANSMISSION) {
      ^
drivers/mmc/host/usdhi6rol0.c:1343:2: note: here
  default:
  ^~~~~~~

Warning level 3 was used: -Wimplicit-fallthrough=3

This patch is part of the ongoing efforts to enable
-Wimplicit-fallthrough.

Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Gustavo A. R. Silva
2019-05-01 15:36:21 -05:00
committed by Ulf Hansson
parent 9e4be8d03f
commit 7a019f9b43
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/mmc/host/usdhi6rol0.c
View File

@@ -1339,7 +1339,7 @@ static int usdhi6_stop_cmd(struct usdhi6_host *host)
host->wait = USDHI6_WAIT_FOR_STOP; host->wait = USDHI6_WAIT_FOR_STOP;
return 0; return 0;
} }
/* Unsupported STOP command */ /* fall through - Unsupported STOP command. */
default: default:
dev_err(mmc_dev(host->mmc), dev_err(mmc_dev(host->mmc),
"unsupported stop CMD%d for CMD%d\n", "unsupported stop CMD%d for CMD%d\n",
@@ -1687,7 +1687,7 @@ static void usdhi6_timeout_work(struct work_struct *work)
switch (host->wait) { switch (host->wait) {
default: default:
dev_err(mmc_dev(host->mmc), "Invalid state %u\n", host->wait); dev_err(mmc_dev(host->mmc), "Invalid state %u\n", host->wait);
/* mrq can be NULL in this actually impossible case */ /* fall through - mrq can be NULL, but is impossible. */
case USDHI6_WAIT_FOR_CMD: case USDHI6_WAIT_FOR_CMD:
usdhi6_error_code(host); usdhi6_error_code(host);
if (mrq) if (mrq)
@@ -1709,10 +1709,7 @@ static void usdhi6_timeout_work(struct work_struct *work)
host->offset, data->blocks, data->blksz, data->sg_len, host->offset, data->blocks, data->blksz, data->sg_len,
sg_dma_len(sg), sg->offset); sg_dma_len(sg), sg->offset);
usdhi6_sg_unmap(host, true); usdhi6_sg_unmap(host, true);
/* /* fall through - page unmapped in USDHI6_WAIT_FOR_DATA_END. */
* If USDHI6_WAIT_FOR_DATA_END times out, we have already unmapped
* the page
*/
case USDHI6_WAIT_FOR_DATA_END: case USDHI6_WAIT_FOR_DATA_END:
usdhi6_error_code(host); usdhi6_error_code(host);
data->error = -ETIMEDOUT; data->error = -ETIMEDOUT;