Skip to content

Commit 1127b21

Browse files
committed
Merge tag 'fallthrough-fixes-5.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux
Pull fallthrough fixes from Gustavo A. R. Silva: "Fix some minor issues introduced by the recent treewide fallthrough conversions: - Fix identation issue - Fix erroneous fallthrough annotation - Remove unnecessary fallthrough annotation - Fix code comment changed by fallthrough conversion" * tag 'fallthrough-fixes-5.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux: arm64/cpuinfo: Remove unnecessary fallthrough annotation media: dib0700: Fix identation issue in dib8096_set_param_override() afs: Remove erroneous fallthough annotation iio: dpot-dac: fix code comment in dpot_dac_read_raw()
2 parents 0a4c56c + c165a08 commit 1127b21

4 files changed

Lines changed: 7 additions & 8 deletions

File tree

arch/arm64/kernel/cpuinfo.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,6 @@ static void cpuinfo_detect_icache_policy(struct cpuinfo_arm64 *info)
327327
set_bit(ICACHEF_VPIPT, &__icache_flags);
328328
break;
329329
default:
330-
fallthrough;
331330
case ICACHE_POLICY_VIPT:
332331
/* Assume aliasing */
333332
set_bit(ICACHEF_ALIASING, &__icache_flags);

drivers/iio/dac/dpot-dac.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,11 @@ static int dpot_dac_read_raw(struct iio_dev *indio_dev,
7474
case IIO_VAL_INT:
7575
/*
7676
* Convert integer scale to fractional scale by
77-
* setting the denominator (val2) to one, and...
77+
* setting the denominator (val2) to one...
7878
*/
7979
*val2 = 1;
8080
ret = IIO_VAL_FRACTIONAL;
81+
/* ...and fall through. Say it again for GCC. */
8182
fallthrough;
8283
case IIO_VAL_FRACTIONAL:
8384
*val *= regulator_get_voltage(dac->vref) / 1000;

drivers/media/usb/dvb-usb/dib0700_devices.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1659,14 +1659,14 @@ static int dib8096_set_param_override(struct dvb_frontend *fe)
16591659

16601660
switch (band) {
16611661
default:
1662-
deb_info("Warning : Rf frequency (%iHz) is not in the supported range, using VHF switch ", fe->dtv_property_cache.frequency);
1662+
deb_info("Warning : Rf frequency (%iHz) is not in the supported range, using VHF switch ", fe->dtv_property_cache.frequency);
16631663
fallthrough;
16641664
case BAND_VHF:
1665-
state->dib8000_ops.set_gpio(fe, 3, 0, 1);
1666-
break;
1665+
state->dib8000_ops.set_gpio(fe, 3, 0, 1);
1666+
break;
16671667
case BAND_UHF:
1668-
state->dib8000_ops.set_gpio(fe, 3, 0, 0);
1669-
break;
1668+
state->dib8000_ops.set_gpio(fe, 3, 0, 0);
1669+
break;
16701670
}
16711671

16721672
ret = state->set_param_save(fe);

fs/afs/flock.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,6 @@ void afs_lock_work(struct work_struct *work)
376376
spin_unlock(&vnode->lock);
377377
return;
378378

379-
fallthrough;
380379
default:
381380
/* Looks like a lock request was withdrawn. */
382381
spin_unlock(&vnode->lock);

0 commit comments

Comments
 (0)