Patched in Tegra support.

1 files changed, 52 insertions, 21 deletions

diff --git a/drivers/hwmon/jz4740-hwmon.c b/drivers/hwmon/jz4740-hwmon.c
index e0d66b9590a..b65a4dae3f5 100644
--- a/drivers/hwmon/jz4740-hwmon.c
+++ b/drivers/hwmon/jz4740-hwmon.c
@@ -20,7 +20,6 @@
 #include <linux/mutex.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
-#include <linux/io.h>
 
 #include <linux/completion.h>
 #include <linux/mfd/core.h>
@@ -102,42 +101,47 @@ static const struct attribute_group jz4740_hwmon_attr_group = {
         .attrs = jz4740_hwmon_attributes,
 };
 
-static int jz4740_hwmon_probe(struct platform_device *pdev)
+static int __devinit jz4740_hwmon_probe(struct platform_device *pdev)
 {
         int ret;
         struct jz4740_hwmon *hwmon;
 
-        hwmon = devm_kzalloc(&pdev->dev, sizeof(*hwmon), GFP_KERNEL);
-        if (!hwmon)
+        hwmon = kmalloc(sizeof(*hwmon), GFP_KERNEL);
+        if (!hwmon) {
+                dev_err(&pdev->dev, "Failed to allocate driver structure\n");
                 return -ENOMEM;
+        }
 
         hwmon->cell = mfd_get_cell(pdev);
 
         hwmon->irq = platform_get_irq(pdev, 0);
         if (hwmon->irq < 0) {
-                dev_err(&pdev->dev, "Failed to get platform irq: %d\n",
-                        hwmon->irq);
-                return hwmon->irq;
+                ret = hwmon->irq;
+                dev_err(&pdev->dev, "Failed to get platform irq: %d\n", ret);
+                goto err_free;
         }
 
         hwmon->mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (!hwmon->mem) {
+                ret = -ENOENT;
                 dev_err(&pdev->dev, "Failed to get platform mmio resource\n");
-                return -ENOENT;
+                goto err_free;
         }
 
-        hwmon->mem = devm_request_mem_region(&pdev->dev, hwmon->mem->start,
+        hwmon->mem = request_mem_region(hwmon->mem->start,
                         resource_size(hwmon->mem), pdev->name);
         if (!hwmon->mem) {
+                ret = -EBUSY;
                 dev_err(&pdev->dev, "Failed to request mmio memory region\n");
-                return -EBUSY;
+                goto err_free;
         }
 
-        hwmon->base = devm_ioremap_nocache(&pdev->dev, hwmon->mem->start,
-                                           resource_size(hwmon->mem));
+        hwmon->base = ioremap_nocache(hwmon->mem->start,
+                        resource_size(hwmon->mem));
         if (!hwmon->base) {
+                ret = -EBUSY;
                 dev_err(&pdev->dev, "Failed to ioremap mmio memory\n");
-                return -EBUSY;
+                goto err_release_mem_region;
         }
 
         init_completion(&hwmon->read_completion);
@@ -145,18 +149,17 @@ static int jz4740_hwmon_probe(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, hwmon);
 
-        ret = devm_request_irq(&pdev->dev, hwmon->irq, jz4740_hwmon_irq, 0,
-                               pdev->name, hwmon);
+        ret = request_irq(hwmon->irq, jz4740_hwmon_irq, 0, pdev->name, hwmon);
         if (ret) {
                 dev_err(&pdev->dev, "Failed to request irq: %d\n", ret);
-                return ret;
+                goto err_iounmap;
         }
         disable_irq(hwmon->irq);
 
         ret = sysfs_create_group(&pdev->dev.kobj, &jz4740_hwmon_attr_group);
         if (ret) {
                 dev_err(&pdev->dev, "Failed to create sysfs group: %d\n", ret);
-                return ret;
+                goto err_free_irq;
         }
 
         hwmon->hwmon = hwmon_device_register(&pdev->dev);
@@ -169,29 +172,57 @@ static int jz4740_hwmon_probe(struct platform_device *pdev)
 
 err_remove_file:
         sysfs_remove_group(&pdev->dev.kobj, &jz4740_hwmon_attr_group);
+err_free_irq:
+        free_irq(hwmon->irq, hwmon);
+err_iounmap:
+        platform_set_drvdata(pdev, NULL);
+        iounmap(hwmon->base);
+err_release_mem_region:
+        release_mem_region(hwmon->mem->start, resource_size(hwmon->mem));
+err_free:
+        kfree(hwmon);
+
         return ret;
 }
 
-static int jz4740_hwmon_remove(struct platform_device *pdev)
+static int __devexit jz4740_hwmon_remove(struct platform_device *pdev)
 {
         struct jz4740_hwmon *hwmon = platform_get_drvdata(pdev);
 
         hwmon_device_unregister(hwmon->hwmon);
         sysfs_remove_group(&pdev->dev.kobj, &jz4740_hwmon_attr_group);
 
+        free_irq(hwmon->irq, hwmon);
+
+        iounmap(hwmon->base);
+        release_mem_region(hwmon->mem->start, resource_size(hwmon->mem));
+
+        platform_set_drvdata(pdev, NULL);
+        kfree(hwmon);
+
         return 0;
 }
 
-static struct platform_driver jz4740_hwmon_driver = {
+struct platform_driver jz4740_hwmon_driver = {
         .probe  = jz4740_hwmon_probe,
-        .remove = jz4740_hwmon_remove,
+        .remove = __devexit_p(jz4740_hwmon_remove),
         .driver = {
                 .name = "jz4740-hwmon",
                 .owner = THIS_MODULE,
         },
 };
 
-module_platform_driver(jz4740_hwmon_driver);
+static int __init jz4740_hwmon_init(void)
+{
+        return platform_driver_register(&jz4740_hwmon_driver);
+}
+module_init(jz4740_hwmon_init);
+
+static void __exit jz4740_hwmon_exit(void)
+{
+        platform_driver_unregister(&jz4740_hwmon_driver);
+}
+module_exit(jz4740_hwmon_exit);
 
 MODULE_DESCRIPTION("JZ4740 SoC HWMON driver");
 MODULE_AUTHOR("Lars-Peter Clausen <lars@metafoo.de>");