2021-11-06 21:41:40

by Geert Uytterhoeven

Subject: [PATCH -next] ataflop: Add missing semicolon to return statement

drivers/block/ataflop.c: In function ‘ataflop_probe’:
drivers/block/ataflop.c:2023:2: error: expected expression before ‘if’
2023 | if (ataflop_alloc_disk(drive, type))
| ^~
drivers/block/ataflop.c:2023:2: error: ‘return’ with a value, in function returning void [-Werror=return-type]
drivers/block/ataflop.c:2011:13: note: declared here
2011 | static void ataflop_probe(dev_t dev)
| ^~~~~~~~~~~~~

Fixes: 46a7db492e7a2740 ("ataflop: address add_disk() error handling on probe")
Reported-by: [email protected]
Signed-off-by: Geert Uytterhoeven <[email protected]>
---
Feel free to fold into the commit that introduced the issue.
---
drivers/block/ataflop.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/block/ataflop.c b/drivers/block/ataflop.c
index de8c3785899a5de3..bf769e6e32fef92b 100644
--- a/drivers/block/ataflop.c
+++ b/drivers/block/ataflop.c
@@ -2019,7 +2019,7 @@ static void ataflop_probe(dev_t dev)
if (drive >= FD_MAX_UNITS || type >= NUM_DISK_MINORS)
return;
if (unit[drive].disk[type])
- return
+ return;
if (ataflop_alloc_disk(drive, type))
return;
if (add_disk(unit[drive].disk[type]))
--
2.25.1

2021-11-07 07:58:27

by Jens Axboe

Subject: Re: [PATCH -next] ataflop: Add missing semicolon to return statement

On Sat, 6 Nov 2021 19:55:49 +0100, Geert Uytterhoeven wrote:
> drivers/block/ataflop.c: In function ‘ataflop_probe’:
> drivers/block/ataflop.c:2023:2: error: expected expression before ‘if’
> 2023 | if (ataflop_alloc_disk(drive, type))
> | ^~
> drivers/block/ataflop.c:2023:2: error: ‘return’ with a value, in function returning void [-Werror=return-type]
> drivers/block/ataflop.c:2011:13: note: declared here
> 2011 | static void ataflop_probe(dev_t dev)
> | ^~~~~~~~~~~~~
>
> [...]

Applied, thanks!

[1/1] ataflop: Add missing semicolon to return statement
commit: 38987a872b313e72f7a64e91ec0b8084eaec0f10

Best regards,
--
Jens Axboe