forked from Sricharanti/sricharan
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/k…
…ernel/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
- Loading branch information
Showing
10 changed files
with
126 additions
and
126 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -64,7 +64,7 @@ | |
* Author: Chris Verges <[email protected]> | ||
* | ||
* derived from ad5252.c | ||
* Copyright (c) 2006 Michael Hennerich <[email protected]> | ||
* Copyright (c) 2006-2011 Michael Hennerich <[email protected]> | ||
* | ||
* Licensed under the GPL-2 or later. | ||
*/ | ||
|
@@ -76,8 +76,6 @@ | |
#include <linux/delay.h> | ||
#include <linux/slab.h> | ||
|
||
#define DRIVER_VERSION "0.2" | ||
|
||
#include "ad525x_dpot.h" | ||
|
||
/* | ||
|
@@ -687,8 +685,9 @@ inline void ad_dpot_remove_files(struct device *dev, | |
} | ||
} | ||
|
||
__devinit int ad_dpot_probe(struct device *dev, | ||
struct ad_dpot_bus_data *bdata, const struct ad_dpot_id *id) | ||
int __devinit ad_dpot_probe(struct device *dev, | ||
struct ad_dpot_bus_data *bdata, unsigned long devid, | ||
const char *name) | ||
{ | ||
|
||
struct dpot_data *data; | ||
|
@@ -704,13 +703,13 @@ __devinit int ad_dpot_probe(struct device *dev, | |
mutex_init(&data->update_lock); | ||
|
||
data->bdata = *bdata; | ||
data->devid = id->devid; | ||
data->devid = devid; | ||
|
||
data->max_pos = 1 << DPOT_MAX_POS(data->devid); | ||
data->max_pos = 1 << DPOT_MAX_POS(devid); | ||
data->rdac_mask = data->max_pos - 1; | ||
data->feat = DPOT_FEAT(data->devid); | ||
data->uid = DPOT_UID(data->devid); | ||
data->wipers = DPOT_WIPERS(data->devid); | ||
data->feat = DPOT_FEAT(devid); | ||
data->uid = DPOT_UID(devid); | ||
data->wipers = DPOT_WIPERS(devid); | ||
|
||
for (i = DPOT_RDAC0; i < MAX_RDACS; i++) | ||
if (data->wipers & (1 << i)) { | ||
|
@@ -731,7 +730,7 @@ __devinit int ad_dpot_probe(struct device *dev, | |
} | ||
|
||
dev_info(dev, "%s %d-Position Digital Potentiometer registered\n", | ||
id->name, data->max_pos); | ||
name, data->max_pos); | ||
|
||
return 0; | ||
|
||
|
@@ -745,7 +744,7 @@ __devinit int ad_dpot_probe(struct device *dev, | |
dev_set_drvdata(dev, NULL); | ||
exit: | ||
dev_err(dev, "failed to create client for %s ID 0x%lX\n", | ||
id->name, id->devid); | ||
name, devid); | ||
return err; | ||
} | ||
EXPORT_SYMBOL(ad_dpot_probe); | ||
|
@@ -770,4 +769,3 @@ MODULE_AUTHOR("Chris Verges <[email protected]>, " | |
"Michael Hennerich <[email protected]>"); | ||
MODULE_DESCRIPTION("Digital potentiometer driver"); | ||
MODULE_LICENSE("GPL"); | ||
MODULE_VERSION(DRIVER_VERSION); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.