diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-09 12:08:59 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-09 12:08:59 -0800 |
| commit | 21a2cb565a74bf794d343ce22300c5f6c1568ae1 (patch) | |
| tree | 5cf49d94bc8cc31a299417b8a362f0645b41c543 /drivers/misc/ad525x_dpot-i2c.c | |
| parent | c99516ca854770000c277b2680a15581c691e18c (diff) | |
| parent | 2a5ac6f7a9c0a24adcf68e0dd634afbe083191c1 (diff) | |
Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
* 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
isl29020: Remove a redundant semi-colon from return statement
BMP085: Remove redundant semi-colon from return statement
drivers:misc: ti-st: DEBUG uart, baud rate mods
drivers:misc: ti-st: flush UART upon fw failure
drivers:misc: ti-st: protect registrations
char_dev.c: fix up some whitespace errors
s390: tape_class.h: remove kobj_map.h inclusion
misc: ad525x_dpot: Add support for SPI module device table matching
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 a39e0555df6..83adab69bfd 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) |