From 054b6994571864eec545924166e5ae2bb5c23596 Mon Sep 17 00:00:00 2001 From: Shunqian Zheng Date: Wed, 26 May 2021 17:25:54 +0800 Subject: [PATCH] iio: imu: inv_icm42600: fix build error Icm42600 was backported from upstream kernel. Let icm24600 adopt kernel version 4.19 with minimal changes. Signed-off-by: Shunqian Zheng Change-Id: I5d4717bdd2e8d04732015d01a9587868165fea9a --- drivers/iio/imu/inv_icm42600/inv_icm42600.h | 2 +- drivers/iio/imu/inv_icm42600/inv_icm42600_core.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/iio/imu/inv_icm42600/inv_icm42600.h b/drivers/iio/imu/inv_icm42600/inv_icm42600.h index c0f5059b13b3..236f4648c5eb 100644 --- a/drivers/iio/imu/inv_icm42600/inv_icm42600.h +++ b/drivers/iio/imu/inv_icm42600/inv_icm42600.h @@ -362,7 +362,7 @@ extern const struct regmap_config inv_icm42600_regmap_config; extern const struct dev_pm_ops inv_icm42600_pm_ops; const struct iio_mount_matrix * -inv_icm42600_get_mount_matrix(const struct iio_dev *indio_dev, +inv_icm42600_get_mount_matrix(struct iio_dev *indio_dev, const struct iio_chan_spec *chan); uint32_t inv_icm42600_odr_to_period(enum inv_icm42600_odr odr); diff --git a/drivers/iio/imu/inv_icm42600/inv_icm42600_core.c b/drivers/iio/imu/inv_icm42600/inv_icm42600_core.c index 8bd77185ccb7..c49dc7e906c2 100644 --- a/drivers/iio/imu/inv_icm42600/inv_icm42600_core.c +++ b/drivers/iio/imu/inv_icm42600/inv_icm42600_core.c @@ -90,10 +90,10 @@ static const struct inv_icm42600_hw inv_icm42600_hw[INV_CHIP_NB] = { }; const struct iio_mount_matrix * -inv_icm42600_get_mount_matrix(const struct iio_dev *indio_dev, +inv_icm42600_get_mount_matrix(struct iio_dev *indio_dev, const struct iio_chan_spec *chan) { - const struct inv_icm42600_state *st = iio_device_get_drvdata(indio_dev); + struct inv_icm42600_state *st = iio_device_get_drvdata(indio_dev); return &st->orientation; } @@ -592,7 +592,7 @@ int inv_icm42600_core_probe(struct regmap *regmap, int chip, int irq, st->chip = chip; st->map = regmap; - ret = iio_read_mount_matrix(dev, "mount-matrix", &st->orientation); + ret = of_iio_read_mount_matrix(dev, "mount-matrix", &st->orientation); if (ret) { dev_err(dev, "failed to retrieve mounting matrix %d\n", ret); return ret;