mmc: usdhi6rol0: mark expected switch fall-throughs
Subsystems (2)
PATCH v2 1/1 mmc: usdhi6rol0: mark expected switch fall-throughs
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.odrivers/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.
---
Changes in v2:
- Turn multiple line comments into single line comments.
- Fix additional fall-through warning.
drivers/mmc/host/usdhi6rol0.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/mmc/host/usdhi6rol0.c +3 -6
@@ -1339,7 +1339,7 @@ static int usdhi6_stop_cmd(struct usdhi6_host *host) host->wait =USDHI6_WAIT_FOR_STOP ;return 0 ; } -/* Unsupported STOP command */ +/* fall through - Unsupported STOP command */ default : dev_err(mmc_dev(host->mmc), "unsupported stop CMD%d for CMD%d\n",
@@ -1687,7 +1687,7 @@ static void usdhi6_timeout_work(struct work_struct *work)switch (host->wait) {default :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 in this actually impossible case */ case USDHI6_WAIT_FOR_CMD :usdhi6_error_code (host);if (mrq)
@@ -1709,10 +1709,7 @@ static void usdhi6_timeout_work(struct work_struct *work) host->offset, data->blocks, data->blksz, data->sg_len, sg_dma_len(sg), sg->offset);usdhi6_sg_unmap (host, true); -/* -* If USDHI6_WAIT_FOR_DATA_END times out, we have already unmapped -* the page -*/ +/* fall through - If USDHI6_WAIT_FOR_DATA_END times out, we have already unmapped the page */ case USDHI6_WAIT_FOR_DATA_END :usdhi6_error_code (host); data->error = -ETIMEDOUT ;
Signature · 1 line
2.21.0
Quoted 32 lines · Gustavo A. R. Silva
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
caseUSDHI6_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
caseUSDHI6_WAIT_FOR_DATA_END:
^~~~
CC [M]drivers/isdn/hisax/hisax_isac.odrivers/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:
^~~~~~~
Quoted 6 lines
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 <[email protected]>
Applied for next, thanks!
I took the liberty to clean up the comments, avoiding to break 80 chars per line.
Kind regards
Uffe
Quoted 45 lines
---
Changes in v2:
- Turn multiple line comments into single line comments.
- Fix additional fall-through warning.drivers/mmc/host/usdhi6rol0.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)drivers/mmc/host/usdhi6rol0.c +3
-7@@ -1339,7 +1339,7 @@ static int usdhi6_stop_cmd(struct usdhi6_host *host) host->wait =USDHI6_WAIT_FOR_STOP ;return 0 ; } -/* Unsupported STOP command */ +/* fall through - Unsupported STOP command */ default : dev_err(mmc_dev(host->mmc), "unsupported stop CMD%d for CMD%d\n",@@ -1687,7 +1687,7 @@ static void usdhi6_timeout_work(struct work_struct *work)switch (host->wait) {default :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 in this actually impossible case */ case USDHI6_WAIT_FOR_CMD :usdhi6_error_code (host);if (mrq)@@ -1709,10 +1709,7 @@ static void usdhi6_timeout_work(struct work_struct *work) host->offset, data->blocks, data->blksz, data->sg_len, sg_dma_len(sg), sg->offset);usdhi6_sg_unmap (host, true); -/* -* If USDHI6_WAIT_FOR_DATA_END times out, we have already unmapped -* the page -*/ +/* fall through - If USDHI6_WAIT_FOR_DATA_END times out, we have already unmapped the page */ case USDHI6_WAIT_FOR_DATA_END :usdhi6_error_code (host); data->error = -ETIMEDOUT ; --2.21.0
Quoted 5 lines · Ulf Hansson
Quoted 4 lines · Gustavo A. R. Silva
In preparation to enabling -Wimplicit-fallthrough, mark switch cases where we are expecting to fall through.
[..]
Quoted 6 lines
Quoted 6 lines
Warning level 3 was used: -Wimplicit-fallthrough=3
This patch is part of the ongoing efforts to enable -Wimplicit-fallthrough.
Quoted 7 lines
Quoted 1 line
Signed-off-by Gustavo A. R. Silva <[email protected]>Applied for next, thanks!
I took the liberty to clean up the comments, avoiding to break 80 chars per line.
Awesome. :)
Thanks, Uffe.
--
Gustavo