Merge tag 'ceph-for-4.14-rc1' of git://github.com/ceph/ceph-client

[mirror_ubuntu-bionic-kernel.git] / drivers / i2c / busses / i2c-mv64xxx.c

diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c
index 5c4db65c5019b7692c645dfaec9d391623355a81..a832c45276a42008a0b1a9ebeac00ffb8144a519 100644 (file)
--- a/drivers/i2c/busses/i2c-mv64xxx.c
+++ b/drivers/i2c/busses/i2c-mv64xxx.c
@@ -820,7 +820,7 @@ mv64xxx_of_config(struct mv64xxx_i2c_data *drv_data,
                goto out;
        }
 
-       drv_data->rstc = devm_reset_control_get_optional(dev, NULL);
+       drv_data->rstc = devm_reset_control_get_optional_exclusive(dev, NULL);
        if (IS_ERR(drv_data->rstc)) {
                rc = PTR_ERR(drv_data->rstc);
                goto out;
@@ -975,8 +975,7 @@ mv64xxx_i2c_remove(struct platform_device *dev)
 #ifdef CONFIG_PM
 static int mv64xxx_i2c_resume(struct device *dev)
 {
-       struct platform_device *pdev = to_platform_device(dev);
-       struct mv64xxx_i2c_data *drv_data = platform_get_drvdata(pdev);
+       struct mv64xxx_i2c_data *drv_data = dev_get_drvdata(dev);
 
        mv64xxx_i2c_hw_init(drv_data);