Merge branch 'net-bcmgenet-restore-internal-EPHY-support'

[linux.git] / drivers / mfd / max8997.c

diff --git a/drivers/mfd/max8997.c b/drivers/mfd/max8997.c
index 8c06c09e36d1179f44763dabdd0b5aaf412a0415..68d8f2b952871723c0c9cbdd1525c853629ba363 100644 (file)
--- a/drivers/mfd/max8997.c
+++ b/drivers/mfd/max8997.c
@@ -185,25 +185,25 @@ static int max8997_i2c_probe(struct i2c_client *i2c,
 
        mutex_init(&max8997->iolock);
 
-       max8997->rtc = i2c_new_dummy(i2c->adapter, I2C_ADDR_RTC);
-       if (!max8997->rtc) {
+       max8997->rtc = i2c_new_dummy_device(i2c->adapter, I2C_ADDR_RTC);
+       if (IS_ERR(max8997->rtc)) {
                dev_err(max8997->dev, "Failed to allocate I2C device for RTC\n");
-               return -ENODEV;
+               return PTR_ERR(max8997->rtc);
        }
        i2c_set_clientdata(max8997->rtc, max8997);
 
-       max8997->haptic = i2c_new_dummy(i2c->adapter, I2C_ADDR_HAPTIC);
-       if (!max8997->haptic) {
+       max8997->haptic = i2c_new_dummy_device(i2c->adapter, I2C_ADDR_HAPTIC);
+       if (IS_ERR(max8997->haptic)) {
                dev_err(max8997->dev, "Failed to allocate I2C device for Haptic\n");
-               ret = -ENODEV;
+               ret = PTR_ERR(max8997->haptic);
                goto err_i2c_haptic;
        }
        i2c_set_clientdata(max8997->haptic, max8997);
 
-       max8997->muic = i2c_new_dummy(i2c->adapter, I2C_ADDR_MUIC);
-       if (!max8997->muic) {
+       max8997->muic = i2c_new_dummy_device(i2c->adapter, I2C_ADDR_MUIC);
+       if (IS_ERR(max8997->muic)) {
                dev_err(max8997->dev, "Failed to allocate I2C device for MUIC\n");
-               ret = -ENODEV;
+               ret = PTR_ERR(max8997->muic);
                goto err_i2c_muic;
        }
        i2c_set_clientdata(max8997->muic, max8997);