Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: hwmon: (jz4740) Staticise jz4740_hwmon_driver hwmon: (jz4740) fix signedness bug
This commit is contained in:
commit
12870da5c3
|
@ -59,7 +59,7 @@ static ssize_t jz4740_hwmon_read_adcin(struct device *dev,
|
||||||
{
|
{
|
||||||
struct jz4740_hwmon *hwmon = dev_get_drvdata(dev);
|
struct jz4740_hwmon *hwmon = dev_get_drvdata(dev);
|
||||||
struct completion *completion = &hwmon->read_completion;
|
struct completion *completion = &hwmon->read_completion;
|
||||||
unsigned long t;
|
long t;
|
||||||
unsigned long val;
|
unsigned long val;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
|
@ -203,7 +203,7 @@ static int __devexit jz4740_hwmon_remove(struct platform_device *pdev)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
struct platform_driver jz4740_hwmon_driver = {
|
static struct platform_driver jz4740_hwmon_driver = {
|
||||||
.probe = jz4740_hwmon_probe,
|
.probe = jz4740_hwmon_probe,
|
||||||
.remove = __devexit_p(jz4740_hwmon_remove),
|
.remove = __devexit_p(jz4740_hwmon_remove),
|
||||||
.driver = {
|
.driver = {
|
||||||
|
|
Loading…
Reference in New Issue