Skip to content

Commit 1e8e13c

Browse files
andy-shevgregkh
authored andcommitted
iio: core: Replace lockdep_set_class() + mutex_init() by combined call
[ Upstream commit c76ba4b ] Replace lockdep_set_class() + mutex_init() by combined call mutex_init_with_key(). Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Reviewed-by: Nuno Sá <nuno.sa@analog.com> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Stable-dep-of: 9910159 ("iio: core: add separate lockdep class for info_exist_lock") Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 5210af7 commit 1e8e13c

1 file changed

Lines changed: 1 addition & 2 deletions

File tree

drivers/iio/industrialio-core.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1696,9 +1696,8 @@ struct iio_dev *iio_device_alloc(struct device *parent, int sizeof_priv)
16961696
INIT_LIST_HEAD(&iio_dev_opaque->ioctl_handlers);
16971697

16981698
lockdep_register_key(&iio_dev_opaque->mlock_key);
1699-
lockdep_set_class(&iio_dev_opaque->mlock, &iio_dev_opaque->mlock_key);
17001699

1701-
mutex_init(&iio_dev_opaque->mlock);
1700+
mutex_init_with_key(&iio_dev_opaque->mlock, &iio_dev_opaque->mlock_key);
17021701
mutex_init(&iio_dev_opaque->info_exist_lock);
17031702

17041703
return indio_dev;

0 commit comments

Comments
 (0)