Commit 1127b219 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'fallthrough-fixes-5.9-rc3' of...

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()
parents 0a4c56c8 c165a08d
...@@ -327,7 +327,6 @@ static void cpuinfo_detect_icache_policy(struct cpuinfo_arm64 *info) ...@@ -327,7 +327,6 @@ static void cpuinfo_detect_icache_policy(struct cpuinfo_arm64 *info)
set_bit(ICACHEF_VPIPT, &__icache_flags); set_bit(ICACHEF_VPIPT, &__icache_flags);
break; break;
default: default:
fallthrough;
case ICACHE_POLICY_VIPT: case ICACHE_POLICY_VIPT:
/* Assume aliasing */ /* Assume aliasing */
set_bit(ICACHEF_ALIASING, &__icache_flags); set_bit(ICACHEF_ALIASING, &__icache_flags);
......
...@@ -74,10 +74,11 @@ static int dpot_dac_read_raw(struct iio_dev *indio_dev, ...@@ -74,10 +74,11 @@ static int dpot_dac_read_raw(struct iio_dev *indio_dev,
case IIO_VAL_INT: case IIO_VAL_INT:
/* /*
* Convert integer scale to fractional scale by * Convert integer scale to fractional scale by
* setting the denominator (val2) to one, and... * setting the denominator (val2) to one...
*/ */
*val2 = 1; *val2 = 1;
ret = IIO_VAL_FRACTIONAL; ret = IIO_VAL_FRACTIONAL;
/* ...and fall through. Say it again for GCC. */
fallthrough; fallthrough;
case IIO_VAL_FRACTIONAL: case IIO_VAL_FRACTIONAL:
*val *= regulator_get_voltage(dac->vref) / 1000; *val *= regulator_get_voltage(dac->vref) / 1000;
......
...@@ -1659,14 +1659,14 @@ static int dib8096_set_param_override(struct dvb_frontend *fe) ...@@ -1659,14 +1659,14 @@ static int dib8096_set_param_override(struct dvb_frontend *fe)
switch (band) { switch (band) {
default: default:
deb_info("Warning : Rf frequency (%iHz) is not in the supported range, using VHF switch ", fe->dtv_property_cache.frequency); deb_info("Warning : Rf frequency (%iHz) is not in the supported range, using VHF switch ", fe->dtv_property_cache.frequency);
fallthrough; fallthrough;
case BAND_VHF: case BAND_VHF:
state->dib8000_ops.set_gpio(fe, 3, 0, 1); state->dib8000_ops.set_gpio(fe, 3, 0, 1);
break; break;
case BAND_UHF: case BAND_UHF:
state->dib8000_ops.set_gpio(fe, 3, 0, 0); state->dib8000_ops.set_gpio(fe, 3, 0, 0);
break; break;
} }
ret = state->set_param_save(fe); ret = state->set_param_save(fe);
......
...@@ -376,7 +376,6 @@ void afs_lock_work(struct work_struct *work) ...@@ -376,7 +376,6 @@ void afs_lock_work(struct work_struct *work)
spin_unlock(&vnode->lock); spin_unlock(&vnode->lock);
return; return;
fallthrough;
default: default:
/* Looks like a lock request was withdrawn. */ /* Looks like a lock request was withdrawn. */
spin_unlock(&vnode->lock); spin_unlock(&vnode->lock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment