Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=e296fb7f301f3c3398adc6d991b097cfa73e1c0c
Commit: e296fb7f301f3c3398adc6d991b097cfa73e1c0c
Parent: b9cdad74883a797952de52464d118d685cafc05a
Author: Jean Delvare <[EMAIL PROTECTED]>
AuthorDate: Thu Jul 12 14:12:31 2007 +0200
Committer: Jean Delvare <[EMAIL PROTECTED]>
CommitDate: Thu Jul 12 14:12:31 2007 +0200
i2c/tsl2550: Speed up initialization
There's some redundancy in the tsl2550 initialization sequence. It is
powering up the device twice, and setting the operating mode twice
too. Setting things just once saves SMBus transactions, which aren't
always cheap, speeding up the device initialization.
Signed-off-by: Jean Delvare <[EMAIL PROTECTED]>
Cc: Rodolfo Giometti <[EMAIL PROTECTED]>
---
drivers/i2c/chips/tsl2550.c | 46 ++++++++++++++++++++++++------------------
1 files changed, 26 insertions(+), 20 deletions(-)
diff --git a/drivers/i2c/chips/tsl2550.c b/drivers/i2c/chips/tsl2550.c
index ef80330..3de4b19 100644
--- a/drivers/i2c/chips/tsl2550.c
+++ b/drivers/i2c/chips/tsl2550.c
@@ -27,7 +27,7 @@
#include <linux/delay.h>
#define TSL2550_DRV_NAME "tsl2550"
-#define DRIVER_VERSION "1.1.0"
+#define DRIVER_VERSION "1.1.1"
/*
* Defines
@@ -333,13 +333,30 @@ static const struct attribute_group tsl2550_attr_group = {
* Initialization function
*/
-static void tsl2550_init_client(struct i2c_client *client)
+static int tsl2550_init_client(struct i2c_client *client)
{
struct tsl2550_data *data = i2c_get_clientdata(client);
+ int err;
- /* Power up the device and set the default operating mode */
- tsl2550_set_power_state(client, 1);
- tsl2550_set_operating_mode(client, data->operating_mode);
+ /*
+ * Probe the chip. To do so we try to power up the device and then to
+ * read back the 0x03 code
+ */
+ err = i2c_smbus_write_byte(client, TSL2550_POWER_UP);
+ if (err < 0)
+ return err;
+ mdelay(1);
+ if (i2c_smbus_read_byte(client) != TSL2550_POWER_UP)
+ return -ENODEV;
+ data->power_state = 1;
+
+ /* Set the default operating mode */
+ err = i2c_smbus_write_byte(client,
+ TSL2550_MODE_RANGE[data->operating_mode]);
+ if (err < 0)
+ return err;
+
+ return 0;
}
/*
@@ -381,24 +398,12 @@ static int __devinit tsl2550_probe(struct i2c_client
*client)
dev_info(&client->dev, "%s operating mode\n",
data->operating_mode ? "extended" : "standard");
- /*
- * Probe the chip. To do so we try to power up the device and then to
- * read back the 0x03 code
- */
- err = i2c_smbus_write_byte(client, TSL2550_POWER_UP);
- if (err < 0)
- goto exit_kfree;
- mdelay(1);
- err = i2c_smbus_read_byte(client);
- if (err != TSL2550_POWER_UP) {
- err = -ENODEV;
- goto exit_kfree;
- }
-
mutex_init(&data->update_lock);
/* Initialize the TSL2550 chip */
- tsl2550_init_client(client);
+ err = tsl2550_init_client(client);
+ if (err)
+ goto exit_kfree;
/* Register sysfs hooks */
err = sysfs_create_group(&client->dev.kobj, &tsl2550_attr_group);
@@ -449,6 +454,7 @@ static void __exit tsl2550_exit(void)
MODULE_AUTHOR("Rodolfo Giometti <[EMAIL PROTECTED]>");
MODULE_DESCRIPTION("TSL2550 ambient light sensor driver");
MODULE_LICENSE("GPL");
+MODULE_VERSION(DRIVER_VERSION);
module_init(tsl2550_init);
module_exit(tsl2550_exit);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
