Commit 12870da5 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'hwmon-for-linus' of...

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
parents 71fe5cca d6c4f2ac
...@@ -59,7 +59,7 @@ static ssize_t jz4740_hwmon_read_adcin(struct device *dev, ...@@ -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) ...@@ -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 = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment