diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-09-14 07:57:52 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-09-14 07:57:52 +0300 |
| commit | 1622d35453132a1acd6d650175f9f45e4bcf553e (patch) | |
| tree | 063a2dfa220452590d068418c2b16b90690dae5a /drivers/net/arcnet/arc-rimi.c | |
| parent | 978620cc4f5577c5139da9d8377849aeac46687a (diff) | |
| parent | 856deb866d16e29bd65952e0289066f6078af773 (diff) | |
| download | linux-1622d35453132a1acd6d650175f9f45e4bcf553e.tar.xz | |
Merge 5.9-rc5 into staging-next
We want the staging/iio changes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/arcnet/arc-rimi.c')
| -rw-r--r-- | drivers/net/arcnet/arc-rimi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/arcnet/arc-rimi.c b/drivers/net/arcnet/arc-rimi.c index 14a5fb378145..98df38fe553c 100644 --- a/drivers/net/arcnet/arc-rimi.c +++ b/drivers/net/arcnet/arc-rimi.c @@ -363,13 +363,13 @@ static int __init arcrimi_setup(char *s) switch (ints[0]) { default: /* ERROR */ pr_err("Too many arguments\n"); - /* Fall through */ + fallthrough; case 3: /* Node ID */ node = ints[3]; - /* Fall through */ + fallthrough; case 2: /* IRQ */ irq = ints[2]; - /* Fall through */ + fallthrough; case 1: /* IO address */ io = ints[1]; } |