Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging

* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  i2c: Remove all i2c_set_clientdata(client, NULL) in drivers
  i2c/busses: Move two drivers to embedded section
  i2c: Rename i2c_check_addr to i2c_check_addr_busy
  i2c: Document reserved I2C addresses
  i2c: Check for address validity on client registration
  i2c: Share the I2C device presence detection code
  Documentation/i2c: Checkpatch cleanup
This commit is contained in:
Linus Torvalds 2010-06-03 15:44:43 -07:00
commit ceadda057c
85 changed files with 191 additions and 287 deletions

View file

@ -403,7 +403,6 @@ out_irq:
free_irq(client->irq, client);
out_free:
i2c_set_clientdata(client, NULL);
kfree(ds1374);
return ret;
}
@ -422,7 +421,6 @@ static int __devexit ds1374_remove(struct i2c_client *client)
}
rtc_device_unregister(ds1374->rtc);
i2c_set_clientdata(client, NULL);
kfree(ds1374);
return 0;
}

View file

@ -632,7 +632,6 @@ errout_reg:
rtc_device_unregister(rx8025->rtc);
errout_free:
i2c_set_clientdata(client, NULL);
kfree(rx8025);
errout:
@ -656,7 +655,6 @@ static int __devexit rx8025_remove(struct i2c_client *client)
rx8025_sysfs_unregister(&client->dev);
rtc_device_unregister(rx8025->rtc);
i2c_set_clientdata(client, NULL);
kfree(rx8025);
return 0;
}

View file

@ -275,7 +275,6 @@ exit_dummy:
if (s35390a->client[i])
i2c_unregister_device(s35390a->client[i]);
kfree(s35390a);
i2c_set_clientdata(client, NULL);
exit:
return err;
@ -292,7 +291,6 @@ static int s35390a_remove(struct i2c_client *client)
rtc_device_unregister(s35390a->rtc);
kfree(s35390a);
i2c_set_clientdata(client, NULL);
return 0;
}