Skip to content

Commit 2dabc85

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 c5dbad5 commit 2dabc85

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

drivers/iio/industrialio-core.c

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

17191719
lockdep_register_key(&iio_dev_opaque->mlock_key);
1720-
lockdep_set_class(&iio_dev_opaque->mlock, &iio_dev_opaque->mlock_key);
17211720

1722-
mutex_init(&iio_dev_opaque->mlock);
1721+
mutex_init_with_key(&iio_dev_opaque->mlock, &iio_dev_opaque->mlock_key);
17231722
mutex_init(&iio_dev_opaque->info_exist_lock);
17241723

17251724
indio_dev->dev.parent = parent;

0 commit comments

Comments
 (0)