Hi,
Tested with the following patchset:
i2c-use-class_for_each_device.patch
i2c-simplify-i2c_del_driver.patch
i2c-core-add-detection-capability-to-new-style-drivers.patch
hwmon-f75375s-drop-legacy-driver.patch
and f75375s still works mighty fine when probed new-style. The rtc and led
drivers (both new-style) attached to i2c bus work too.
Acked-by: Riku Voipio <[EMAIL PROTECTED]>
> Drop the legacy f75375s driver, and add a detect callback to the
> new-style driver to achieve the same functionality.
>
> Signed-off-by: Jean Delvare <[EMAIL PROTECTED]>
> ---
> drivers/hwmon/f75375s.c | 74
> +++++++----------------------------------------
> 1 file changed, 12 insertions(+), 62 deletions(-)
>
> --- linux-2.6.26-rc5.orig/drivers/hwmon/f75375s.c 2008-06-05
> 21:04:26.000000000 +0200
> +++ linux-2.6.26-rc5/drivers/hwmon/f75375s.c 2008-06-05 22:14:00.000000000
> +0200
> @@ -114,21 +114,12 @@ struct f75375_data {
> s8 temp_max_hyst[2];
> };
>
> -static int f75375_attach_adapter(struct i2c_adapter *adapter);
> -static int f75375_detect(struct i2c_adapter *adapter, int address, int
> kind);
> -static int f75375_detach_client(struct i2c_client *client);
> +static int f75375_detect(struct i2c_adapter *adapter, int address, int
> kind,
> + struct i2c_board_info *info);
> static int f75375_probe(struct i2c_client *client,
> const struct i2c_device_id *id);
> static int f75375_remove(struct i2c_client *client);
>
> -static struct i2c_driver f75375_legacy_driver = {
> - .driver = {
> - .name = "f75375_legacy",
> - },
> - .attach_adapter = f75375_attach_adapter,
> - .detach_client = f75375_detach_client,
> -};
> -
> static const struct i2c_device_id f75375_id[] = {
> { "f75373", f75373 },
> { "f75375", f75375 },
> @@ -137,12 +128,15 @@ static const struct i2c_device_id f75375
> MODULE_DEVICE_TABLE(i2c, f75375_id);
>
> static struct i2c_driver f75375_driver = {
> + .class = I2C_CLASS_HWMON,
> .driver = {
> .name = "f75375",
> },
> .probe = f75375_probe,
> .remove = f75375_remove,
> .id_table = f75375_id,
> + .detect = f75375_detect,
> + .address_data = &addr_data,
> };
>
> static inline int f75375_read8(struct i2c_client *client, u8 reg)
> @@ -607,22 +601,6 @@ static const struct attribute_group f753
> .attrs = f75375_attributes,
> };
>
> -static int f75375_detach_client(struct i2c_client *client)
> -{
> - int err;
> -
> - f75375_remove(client);
> - err = i2c_detach_client(client);
> - if (err) {
> - dev_err(&client->dev,
> - "Client deregistration failed, "
> - "client not detached.\n");
> - return err;
> - }
> - kfree(client);
> - return 0;
> -}
> -
> static void f75375_init(struct i2c_client *client, struct f75375_data
> *data,
> struct f75375s_platform_data *f75375s_pdata)
> {
> @@ -700,21 +678,14 @@ static int f75375_remove(struct i2c_clie
> return 0;
> }
>
> -static int f75375_attach_adapter(struct i2c_adapter *adapter)
> -{
> - if (!(adapter->class & I2C_CLASS_HWMON))
> - return 0;
> - return i2c_probe(adapter, &addr_data, f75375_detect);
> -}
> -
> /* This function is called by i2c_probe */
> -static int f75375_detect(struct i2c_adapter *adapter, int address, int
> kind)
> +static int f75375_detect(struct i2c_adapter *adapter, int address, int
> kind,
> + struct i2c_board_info *info)
> {
> struct i2c_client *client;
> u8 version = 0;
> - int err = 0;
> + int err = -ENODEV;
> const char *name = "";
> - struct i2c_device_id id;
>
> if (!(client = kzalloc(sizeof(*client), GFP_KERNEL))) {
> err = -ENOMEM;
> @@ -722,7 +693,6 @@ static int f75375_detect(struct i2c_adap
> }
> client->addr = address;
> client->adapter = adapter;
> - client->driver = &f75375_legacy_driver;
>
> if (kind < 0) {
> u16 vendid = f75375_read16(client, F75375_REG_VENDOR);
> @@ -739,6 +709,7 @@ static int f75375_detect(struct i2c_adap
> goto exit_free;
> }
> }
> + err = 0; /* detection OK */
>
> if (kind == f75375) {
> name = "f75375";
> @@ -746,20 +717,9 @@ static int f75375_detect(struct i2c_adap
> name = "f75373";
> }
> dev_info(&adapter->dev, "found %s version: %02X\n", name, version);
> - strlcpy(client->name, name, I2C_NAME_SIZE);
> + strlcpy(info->type, name, I2C_NAME_SIZE);
> + info->addr = address;
>
> - if ((err = i2c_attach_client(client)))
> - goto exit_free;
> -
> - strlcpy(id.name, name, I2C_NAME_SIZE);
> - id.driver_data = kind;
> - if ((err = f75375_probe(client, &id)) < 0)
> - goto exit_detach;
> -
> - return 0;
> -
> -exit_detach:
> - i2c_detach_client(client);
> exit_free:
> kfree(client);
> exit:
> @@ -768,21 +728,11 @@ exit:
>
> static int __init sensors_f75375_init(void)
> {
> - int status;
> - status = i2c_add_driver(&f75375_driver);
> - if (status)
> - return status;
> -
> - status = i2c_add_driver(&f75375_legacy_driver);
> - if (status)
> - i2c_del_driver(&f75375_driver);
> -
> - return status;
> + return i2c_add_driver(&f75375_driver);
> }
>
> static void __exit sensors_f75375_exit(void)
> {
> - i2c_del_driver(&f75375_legacy_driver);
> i2c_del_driver(&f75375_driver);
> }
>
>
> --
> Jean Delvare
>
_______________________________________________
i2c mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/i2c
