Merge tag 'fallthrough-fixes-5.9-rc3' of... (1127b219) · Commits · 戴 / test

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()

arch/arm64/kernel/cpuinfo.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -327,7 +327,6 @@ static void cpuinfo_detect_icache_policy(struct cpuinfo_arm64 *info)
		set_bit(ICACHEF_VPIPT, &__icache_flags);
		break;
		default:
		fallthrough;
		case ICACHE_POLICY_VIPT:
		/* Assume aliasing */
		set_bit(ICACHEF_ALIASING, &__icache_flags);

drivers/iio/dac/dpot-dac.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -74,10 +74,11 @@ static int dpot_dac_read_raw(struct iio_dev *indio_dev,
		case IIO_VAL_INT:
		/*
		* Convert integer scale to fractional scale by
		* setting the denominator (val2) to one, and...
		* setting the denominator (val2) to one...
		*/
		*val2 = 1;
		ret = IIO_VAL_FRACTIONAL;
		/* ...and fall through. Say it again for GCC. */
		fallthrough;
		case IIO_VAL_FRACTIONAL:
		val = regulator_get_voltage(dac->vref) / 1000;

fs/afs/flock.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -376,7 +376,6 @@ again:
		spin_unlock(&vnode->lock);
		return;

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

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

+5 −5

File changed.

Contains only whitespace changes.

Admin message