iio: core: Replace lockdep_set_class() + mutex_init() by combined call

[ Upstream commit c76ba4b2644424b8dbacee80bb40991eac29d39e ]

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: 9910159f0659 ("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>

diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
index 5d2f35cf18bc3fac91d648616f0c945ce31905da..f69deefcfb6fdb153678bc5f064081579bc3f18f 100644 (file)
--- a/drivers/iio/industrialio-core.c
+++ b/drivers/iio/industrialio-core.c
@@ -1717,9 +1717,8 @@ struct iio_dev *iio_device_alloc(struct device *parent, int sizeof_priv)
        INIT_LIST_HEAD(&iio_dev_opaque->ioctl_handlers);
 
        lockdep_register_key(&iio_dev_opaque->mlock_key);
-       lockdep_set_class(&iio_dev_opaque->mlock, &iio_dev_opaque->mlock_key);
 
-       mutex_init(&iio_dev_opaque->mlock);
+       mutex_init_with_key(&iio_dev_opaque->mlock, &iio_dev_opaque->mlock_key);
        mutex_init(&iio_dev_opaque->info_exist_lock);
 
        indio_dev->dev.parent = parent;