Loading drivers/hwmon/tmp102.c +4 −10 Original line number Diff line number Diff line Loading @@ -159,17 +159,16 @@ static int __devinit tmp102_probe(struct i2c_client *client, return -ENODEV; } tmp102 = kzalloc(sizeof(*tmp102), GFP_KERNEL); if (!tmp102) { dev_dbg(&client->dev, "kzalloc failed\n"); tmp102 = devm_kzalloc(&client->dev, sizeof(*tmp102), GFP_KERNEL); if (!tmp102) return -ENOMEM; } i2c_set_clientdata(client, tmp102); status = i2c_smbus_read_word_swapped(client, TMP102_CONF_REG); if (status < 0) { dev_err(&client->dev, "error reading config register\n"); goto fail_free; return status; } tmp102->config_orig = status; status = i2c_smbus_write_word_swapped(client, TMP102_CONF_REG, Loading Loading @@ -213,9 +212,6 @@ static int __devinit tmp102_probe(struct i2c_client *client, fail_restore_config: i2c_smbus_write_word_swapped(client, TMP102_CONF_REG, tmp102->config_orig); fail_free: kfree(tmp102); return status; } Loading @@ -236,8 +232,6 @@ static int __devexit tmp102_remove(struct i2c_client *client) config | TMP102_CONF_SD); } kfree(tmp102); return 0; } Loading Loading
drivers/hwmon/tmp102.c +4 −10 Original line number Diff line number Diff line Loading @@ -159,17 +159,16 @@ static int __devinit tmp102_probe(struct i2c_client *client, return -ENODEV; } tmp102 = kzalloc(sizeof(*tmp102), GFP_KERNEL); if (!tmp102) { dev_dbg(&client->dev, "kzalloc failed\n"); tmp102 = devm_kzalloc(&client->dev, sizeof(*tmp102), GFP_KERNEL); if (!tmp102) return -ENOMEM; } i2c_set_clientdata(client, tmp102); status = i2c_smbus_read_word_swapped(client, TMP102_CONF_REG); if (status < 0) { dev_err(&client->dev, "error reading config register\n"); goto fail_free; return status; } tmp102->config_orig = status; status = i2c_smbus_write_word_swapped(client, TMP102_CONF_REG, Loading Loading @@ -213,9 +212,6 @@ static int __devinit tmp102_probe(struct i2c_client *client, fail_restore_config: i2c_smbus_write_word_swapped(client, TMP102_CONF_REG, tmp102->config_orig); fail_free: kfree(tmp102); return status; } Loading @@ -236,8 +232,6 @@ static int __devexit tmp102_remove(struct i2c_client *client) config | TMP102_CONF_SD); } kfree(tmp102); return 0; } Loading