Added implementation for '__adis_enable_irq()' and called it instead of
'adis_enable_irq()' inside '__adis_initial_startup()'.
Replaced 'adis_initial_startup()' calls in probe, with its unlocked
variant.
changes in v3:
new patches: 1,2
changed commit message for patches 2-9
changes in v4:
squashed patches 1 & 2 from v3
Ramona Bolboaca (9):
iio: adis: add '__adis_enable_irq()' implementation
iio: accel: adis16201: Call '__adis_initial_startup()' in probe
iio: accel: adis16209: Call '__adis_initial_startup()' in probe
iio: gyro: adis16136: Call '__adis_initial_startup()' in probe
iio: gyro: adis16260: Call '__adis_initial_startup()' in probe
iio: imu: adis16400: Call '__adis_initial_startup()' in probe
staging: iio: accel: adis16203: Call '__adis_initial_startup()'
staging: iio: accel: adis16240: Call '__adis_initial_startup()'
iio: imu: adis: Remove adis_initial_startup function
drivers/iio/accel/adis16201.c | 2 +-
drivers/iio/accel/adis16209.c | 2 +-
drivers/iio/gyro/adis16136.c | 2 +-
drivers/iio/gyro/adis16260.c | 2 +-
drivers/iio/imu/adis.c | 28 ++++++++++-----------------
drivers/iio/imu/adis16400.c | 2 +-
drivers/staging/iio/accel/adis16203.c | 2 +-
drivers/staging/iio/accel/adis16240.c | 2 +-
include/linux/iio/imu/adis.h | 16 +++++++--------
9 files changed, 24 insertions(+), 34 deletions(-)
--
2.25.1
Call '__adis_initial_startup()' instead of its locked variant in
'adis16203_probe()'.
The locks are not needed at this point.
Signed-off-by: Ramona Bolboaca <[email protected]>
Reviewed-by: Nuno Sá <[email protected]>
---
drivers/staging/iio/accel/adis16203.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/iio/accel/adis16203.c b/drivers/staging/iio/accel/adis16203.c
index 62d5397ff1f9..c0e4c9266b5f 100644
--- a/drivers/staging/iio/accel/adis16203.c
+++ b/drivers/staging/iio/accel/adis16203.c
@@ -285,7 +285,7 @@ static int adis16203_probe(struct spi_device *spi)
return ret;
/* Get the device into a sane initial state */
- ret = adis_initial_startup(st);
+ ret = __adis_initial_startup(st);
if (ret)
return ret;
--
2.25.1
Call '__adis_initial_startup()' instead of its locked variant in
'adis16400_probe()'.
The locks are not needed at this point.
Signed-off-by: Ramona Bolboaca <[email protected]>
Reviewed-by: Nuno Sá <[email protected]>
---
drivers/iio/imu/adis16400.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/iio/imu/adis16400.c b/drivers/iio/imu/adis16400.c
index 17bb0c40a149..c02fc35dceb4 100644
--- a/drivers/iio/imu/adis16400.c
+++ b/drivers/iio/imu/adis16400.c
@@ -445,7 +445,7 @@ static int adis16400_initial_setup(struct iio_dev *indio_dev)
st->adis.spi->mode = SPI_MODE_3;
spi_setup(st->adis.spi);
- ret = adis_initial_startup(&st->adis);
+ ret = __adis_initial_startup(&st->adis);
if (ret)
return ret;
--
2.25.1
Call '__adis_initial_startup()' instead of its locked variant in
'adis16260_probe()'.
The locks are not needed at this point.
Signed-off-by: Ramona Bolboaca <[email protected]>
Reviewed-by: Nuno Sá <[email protected]>
---
drivers/iio/gyro/adis16260.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/iio/gyro/adis16260.c b/drivers/iio/gyro/adis16260.c
index eaf57bd339ed..112d635b7dfd 100644
--- a/drivers/iio/gyro/adis16260.c
+++ b/drivers/iio/gyro/adis16260.c
@@ -395,7 +395,7 @@ static int adis16260_probe(struct spi_device *spi)
return ret;
/* Get the device into a sane initial state */
- ret = adis_initial_startup(&adis16260->adis);
+ ret = __adis_initial_startup(&adis16260->adis);
if (ret)
return ret;
--
2.25.1
Call '__adis_initial_startup()' instead of its locked variant in
'adis16201_probe()'.
The locks are not needed at this point.
Signed-off-by: Ramona Bolboaca <[email protected]>
Reviewed-by: Nuno Sá <[email protected]>
---
drivers/iio/accel/adis16201.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/iio/accel/adis16201.c b/drivers/iio/accel/adis16201.c
index dfb8e2e5bdf5..d054721859b3 100644
--- a/drivers/iio/accel/adis16201.c
+++ b/drivers/iio/accel/adis16201.c
@@ -281,7 +281,7 @@ static int adis16201_probe(struct spi_device *spi)
if (ret)
return ret;
- ret = adis_initial_startup(st);
+ ret = __adis_initial_startup(st);
if (ret)
return ret;
--
2.25.1
Add '__adis_enable_irq()' implementation which is the unlocked
version of 'adis_enable_irq()'.
Call '__adis_enable_irq()' instead of 'adis_enable_irq()' from
'__adis_intial_startup()' to keep the expected unlocked functionality.
Fixes: b600bd7eb3335 ("iio: adis: do not disabe IRQs in 'adis_init()'")
Signed-off-by: Ramona Bolboaca <[email protected]>
Reviewed-by: Nuno Sá <[email protected]>
---
drivers/iio/imu/adis.c | 28 ++++++++++------------------
include/linux/iio/imu/adis.h | 12 +++++++++++-
2 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/drivers/iio/imu/adis.c b/drivers/iio/imu/adis.c
index f7fcfd04f659..bc40240b29e2 100644
--- a/drivers/iio/imu/adis.c
+++ b/drivers/iio/imu/adis.c
@@ -270,23 +270,19 @@ EXPORT_SYMBOL_NS(adis_debugfs_reg_access, IIO_ADISLIB);
#endif
/**
- * adis_enable_irq() - Enable or disable data ready IRQ
+ * __adis_enable_irq() - Enable or disable data ready IRQ (unlocked)
* @adis: The adis device
* @enable: Whether to enable the IRQ
*
* Returns 0 on success, negative error code otherwise
*/
-int adis_enable_irq(struct adis *adis, bool enable)
+int __adis_enable_irq(struct adis *adis, bool enable)
{
- int ret = 0;
+ int ret;
u16 msc;
- mutex_lock(&adis->state_lock);
-
- if (adis->data->enable_irq) {
- ret = adis->data->enable_irq(adis, enable);
- goto out_unlock;
- }
+ if (adis->data->enable_irq)
+ return adis->data->enable_irq(adis, enable);
if (adis->data->unmasked_drdy) {
if (enable)
@@ -294,12 +290,12 @@ int adis_enable_irq(struct adis *adis, bool enable)
else
disable_irq(adis->spi->irq);
- goto out_unlock;
+ return 0;
}
ret = __adis_read_reg_16(adis, adis->data->msc_ctrl_reg, &msc);
if (ret)
- goto out_unlock;
+ return ret;
msc |= ADIS_MSC_CTRL_DATA_RDY_POL_HIGH;
msc &= ~ADIS_MSC_CTRL_DATA_RDY_DIO2;
@@ -308,13 +304,9 @@ int adis_enable_irq(struct adis *adis, bool enable)
else
msc &= ~ADIS_MSC_CTRL_DATA_RDY_EN;
- ret = __adis_write_reg_16(adis, adis->data->msc_ctrl_reg, msc);
-
-out_unlock:
- mutex_unlock(&adis->state_lock);
- return ret;
+ return __adis_write_reg_16(adis, adis->data->msc_ctrl_reg, msc);
}
-EXPORT_SYMBOL_NS(adis_enable_irq, IIO_ADISLIB);
+EXPORT_SYMBOL_NS(__adis_enable_irq, IIO_ADISLIB);
/**
* __adis_check_status() - Check the device for error conditions (unlocked)
@@ -445,7 +437,7 @@ int __adis_initial_startup(struct adis *adis)
* with 'IRQF_NO_AUTOEN' anyways.
*/
if (!adis->data->unmasked_drdy)
- adis_enable_irq(adis, false);
+ __adis_enable_irq(adis, false);
if (!adis->data->prod_id_reg)
return 0;
diff --git a/include/linux/iio/imu/adis.h b/include/linux/iio/imu/adis.h
index 515ca09764fe..f5432f3b2b22 100644
--- a/include/linux/iio/imu/adis.h
+++ b/include/linux/iio/imu/adis.h
@@ -402,7 +402,17 @@ static inline int adis_update_bits_base(struct adis *adis, unsigned int reg,
__adis_update_bits_base(adis, reg, mask, val, sizeof(val)); \
})
-int adis_enable_irq(struct adis *adis, bool enable);
+static inline int adis_enable_irq(struct adis *adis, bool enable)
+{
+ int ret;
+
+ mutex_lock(&adis->state_lock);
+ ret = __adis_enable_irq(adis);
+ mutex_unlock(&adis->state_lock);
+
+ return ret;
+}
+
int __adis_check_status(struct adis *adis);
int __adis_initial_startup(struct adis *adis);
--
2.25.1
Call '__adis_initial_startup()' instead of its locked variant in
'adis16209_probe()'.
The locks are not needed at this point.
Signed-off-by: Ramona Bolboaca <[email protected]>
Reviewed-by: Nuno Sá <[email protected]>
---
drivers/iio/accel/adis16209.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/iio/accel/adis16209.c b/drivers/iio/accel/adis16209.c
index 5a9c6e2296f1..0035e4f4db63 100644
--- a/drivers/iio/accel/adis16209.c
+++ b/drivers/iio/accel/adis16209.c
@@ -291,7 +291,7 @@ static int adis16209_probe(struct spi_device *spi)
if (ret)
return ret;
- ret = adis_initial_startup(st);
+ ret = __adis_initial_startup(st);
if (ret)
return ret;
--
2.25.1
Remove adis_initial_startup function since it is not used
anymore.
Signed-off-by: Ramona Bolboaca <[email protected]>
Reviewed-by: Nuno Sá <[email protected]>
---
include/linux/iio/imu/adis.h | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/include/linux/iio/imu/adis.h b/include/linux/iio/imu/adis.h
index f5432f3b2b22..e39092ab6683 100644
--- a/include/linux/iio/imu/adis.h
+++ b/include/linux/iio/imu/adis.h
@@ -427,18 +427,6 @@ static inline int adis_check_status(struct adis *adis)
return ret;
}
-/* locked version of __adis_initial_startup() */
-static inline int adis_initial_startup(struct adis *adis)
-{
- int ret;
-
- mutex_lock(&adis->state_lock);
- ret = __adis_initial_startup(adis);
- mutex_unlock(&adis->state_lock);
-
- return ret;
-}
-
static inline void adis_dev_lock(struct adis *adis)
{
mutex_lock(&adis->state_lock);
--
2.25.1
Call '__adis_initial_startup()' instead of its locked variant in
'adis16240_probe()'.
The locks are not needed at this point.
Signed-off-by: Ramona Bolboaca <[email protected]>
Reviewed-by: Nuno Sá <[email protected]>
---
drivers/staging/iio/accel/adis16240.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/iio/accel/adis16240.c b/drivers/staging/iio/accel/adis16240.c
index bca857eef92e..337492785f04 100644
--- a/drivers/staging/iio/accel/adis16240.c
+++ b/drivers/staging/iio/accel/adis16240.c
@@ -414,7 +414,7 @@ static int adis16240_probe(struct spi_device *spi)
return ret;
/* Get the device into a sane initial state */
- ret = adis_initial_startup(st);
+ ret = __adis_initial_startup(st);
if (ret)
return ret;
--
2.25.1
Hi Ramona,
I love your patch! Perhaps something to improve:
[auto build test WARNING on jic23-iio/togreg]
[also build test WARNING on linus/master v6.1-rc6 next-20221121]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Ramona-Bolboaca/Add-__adis_enable_irq/20221121-202938
base: https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git togreg
patch link: https://lore.kernel.org/r/20221121122655.48268-2-ramona.bolboaca%40analog.com
patch subject: [PATCH v4 1/9] iio: adis: add '__adis_enable_irq()' implementation
config: m68k-allyesconfig
compiler: m68k-linux-gcc (GCC) 12.1.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/intel-lab-lkp/linux/commit/bfde6674ecc00eb34c2af77e57fdb57cd6c1cf03
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Ramona-Bolboaca/Add-__adis_enable_irq/20221121-202938
git checkout bfde6674ecc00eb34c2af77e57fdb57cd6c1cf03
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=m68k SHELL=/bin/bash drivers/iio/accel/ drivers/iio/imu/
If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <[email protected]>
All warnings (new ones prefixed by >>):
In file included from drivers/iio/imu/adis.c:19:
include/linux/iio/imu/adis.h: In function 'adis_enable_irq':
include/linux/iio/imu/adis.h:410:15: error: implicit declaration of function '__adis_enable_irq'; did you mean 'adis_enable_irq'? [-Werror=implicit-function-declaration]
410 | ret = __adis_enable_irq(adis);
| ^~~~~~~~~~~~~~~~~
| adis_enable_irq
drivers/iio/imu/adis.c: At top level:
>> drivers/iio/imu/adis.c:279:5: warning: no previous prototype for '__adis_enable_irq' [-Wmissing-prototypes]
279 | int __adis_enable_irq(struct adis *adis, bool enable)
| ^~~~~~~~~~~~~~~~~
drivers/iio/imu/adis.c:279:5: error: conflicting types for '__adis_enable_irq'; have 'int(struct adis *, bool)' {aka 'int(struct adis *, _Bool)'}
drivers/iio/imu/adis.c:280:1: note: an argument type that has a default promotion cannot match an empty parameter name list declaration
280 | {
| ^
include/linux/iio/imu/adis.h:410:15: note: previous implicit declaration of '__adis_enable_irq' with type 'int()'
410 | ret = __adis_enable_irq(adis);
| ^~~~~~~~~~~~~~~~~
cc1: some warnings being treated as errors
vim +/__adis_enable_irq +279 drivers/iio/imu/adis.c
271
272 /**
273 * __adis_enable_irq() - Enable or disable data ready IRQ (unlocked)
274 * @adis: The adis device
275 * @enable: Whether to enable the IRQ
276 *
277 * Returns 0 on success, negative error code otherwise
278 */
> 279 int __adis_enable_irq(struct adis *adis, bool enable)
280 {
281 int ret;
282 u16 msc;
283
284 if (adis->data->enable_irq)
285 return adis->data->enable_irq(adis, enable);
286
287 if (adis->data->unmasked_drdy) {
288 if (enable)
289 enable_irq(adis->spi->irq);
290 else
291 disable_irq(adis->spi->irq);
292
293 return 0;
294 }
295
296 ret = __adis_read_reg_16(adis, adis->data->msc_ctrl_reg, &msc);
297 if (ret)
298 return ret;
299
300 msc |= ADIS_MSC_CTRL_DATA_RDY_POL_HIGH;
301 msc &= ~ADIS_MSC_CTRL_DATA_RDY_DIO2;
302 if (enable)
303 msc |= ADIS_MSC_CTRL_DATA_RDY_EN;
304 else
305 msc &= ~ADIS_MSC_CTRL_DATA_RDY_EN;
306
307 return __adis_write_reg_16(adis, adis->data->msc_ctrl_reg, msc);
308 }
309 EXPORT_SYMBOL_NS(__adis_enable_irq, IIO_ADISLIB);
310
--
0-DAY CI Kernel Test Service
https://01.org/lkp