diff options
| author | Michael Hennerich <michael.hennerich@analog.com> | 2011-11-18 11:05:11 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-11-18 11:27:02 -0800 |
| commit | 7f3379de9cd91e52c40a48b8c01ebdb2d2eec5cf (patch) | |
| tree | f24d960081a21bf72628db7346a9f05f3eea45b6 /drivers/misc/ad525x_dpot-i2c.c | |
| parent | cfcfc9eca2bcbd26a8e206baeb005b055dbf8e37 (diff) | |
| download | op-kernel-dev-7f3379de9cd91e52c40a48b8c01ebdb2d2eec5cf.zip op-kernel-dev-7f3379de9cd91e52c40a48b8c01ebdb2d2eec5cf.tar.gz | |
misc: ad525x_dpot: Add support for SPI module device table matching
Passing device name via platform data, is a leftover from times where
SPI module device table matching was not existent.
* Add id_table and remove old mechanism.
(To my knowledge no intree boards affected)
* Miscellaneous other cleanup.
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/misc/ad525x_dpot-i2c.c')
| -rw-r--r-- | drivers/misc/ad525x_dpot-i2c.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/misc/ad525x_dpot-i2c.c b/drivers/misc/ad525x_dpot-i2c.c index a39e055..83adab6 100644 --- a/drivers/misc/ad525x_dpot-i2c.c +++ b/drivers/misc/ad525x_dpot-i2c.c @@ -1,7 +1,7 @@ /* * Driver for the Analog Devices digital potentiometers (I2C bus) * - * Copyright (C) 2010 Michael Hennerich, Analog Devices Inc. + * Copyright (C) 2010-2011 Michael Hennerich, Analog Devices Inc. * * Licensed under the GPL-2 or later. */ @@ -11,7 +11,6 @@ #include "ad525x_dpot.h" -/* ------------------------------------------------------------------------- */ /* I2C bus functions */ static int write_d8(void *client, u8 val) { @@ -60,18 +59,13 @@ static int __devinit ad_dpot_i2c_probe(struct i2c_client *client, .bops = &bops, }; - struct ad_dpot_id dpot_id = { - .name = (char *) &id->name, - .devid = id->driver_data, - }; - if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_WORD_DATA)) { dev_err(&client->dev, "SMBUS Word Data not Supported\n"); return -EIO; } - return ad_dpot_probe(&client->dev, &bdata, &dpot_id); + return ad_dpot_probe(&client->dev, &bdata, id->driver_data, id->name); } static int __devexit ad_dpot_i2c_remove(struct i2c_client *client) |
