UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

iio: cros_ec_accel_legacy: Refactor code in cros_ec_accel_legacy_probe 

Refactor some code in order to fix both the technical implementation
and the following warnings:

drivers/iio/accel/cros_ec_accel_legacy.c: In function ‘cros_ec_accel_legacy_probe’:
drivers/iio/accel/cros_ec_accel_legacy.c:387:36: warning: this statement may fall through [-Wimplicit-fallthrough=]
    ec_accel_channels[X].scan_index = Y;
    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~
drivers/iio/accel/cros_ec_accel_legacy.c:388:3: note: here
   case Y:
   ^~~~
drivers/iio/accel/cros_ec_accel_legacy.c:389:36: warning: this statement may fall through [-Wimplicit-fallthrough=]
    ec_accel_channels[Y].scan_index = X;
    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~
drivers/iio/accel/cros_ec_accel_legacy.c:390:3: note: here
   case Z:
   ^~~~

Notice that neither the for loop nor the switch statement is needed.
Also, "state->sign[Y] = 1" should be unconditional.

This patch is part of the ongoing efforts to enable
-Wimplicit-fallthrough.

Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
Acked-by: Kees Cook <keescook@chromium.org>
Acked-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
This commit is contained in:
Gustavo A. R. Silva 2019-02-20 20:06:33 -06:00 committed by Jonathan Cameron
parent f6672544df
commit 74c420e0a5
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/iio/accel/cros_ec_accel_legacy.c
View File

@ -353,7 +353,7 @@ static int cros_ec_accel_legacy_probe(struct platform_device *pdev)
struct cros_ec_sensor_platform *sensor_platform = dev_get_platdata(dev); struct cros_ec_sensor_platform *sensor_platform = dev_get_platdata(dev);
struct iio_dev *indio_dev; struct iio_dev *indio_dev;
struct cros_ec_accel_legacy_state *state; struct cros_ec_accel_legacy_state *state;
int ret, i; int ret;
if (!ec || !ec->ec_dev) { if (!ec || !ec->ec_dev) {
dev_warn(&pdev->dev, "No EC device found.\n"); dev_warn(&pdev->dev, "No EC device found.\n");
@ -381,20 +381,17 @@ static int cros_ec_accel_legacy_probe(struct platform_device *pdev)
* Present the channel using HTML5 standard: * Present the channel using HTML5 standard:
* need to invert X and Y and invert some lid axis. * need to invert X and Y and invert some lid axis.
*/ */
for (i = X ; i < MAX_AXIS; i++) { ec_accel_channels[X].scan_index = Y;
switch (i) { ec_accel_channels[Y].scan_index = X;
case X: ec_accel_channels[Z].scan_index = Z;
ec_accel_channels[X].scan_index = Y;
case Y: state->sign[Y] = 1;
ec_accel_channels[Y].scan_index = X;
case Z: if (state->sensor_num == MOTIONSENSE_LOC_LID)
ec_accel_channels[Z].scan_index = Z; state->sign[X] = state->sign[Z] = -1;
} else
if (state->sensor_num == MOTIONSENSE_LOC_LID && i != Y) state->sign[X] = state->sign[Z] = 1;
state->sign[i] = -1;
else
state->sign[i] = 1;
}
indio_dev->num_channels = ARRAY_SIZE(ec_accel_channels); indio_dev->num_channels = ARRAY_SIZE(ec_accel_channels);
indio_dev->dev.parent = &pdev->dev; indio_dev->dev.parent = &pdev->dev;
indio_dev->info = &cros_ec_accel_legacy_info; indio_dev->info = &cros_ec_accel_legacy_info;