Re: [PATCH] ep93xx-rtc: use ioremap'ed addresses

Any comments on this patch?

Regards,
Hartley 

-----Original Message-----
From: hartleys 
Sent: Monday, February 23, 2009 10:26 AM
To: hartleys; Alessandro Zummo; rtc-linux@googlegroups.com
Cc: arm kernel
Subject: RE: [rtc-linux] RE: [PATCH] ep93xx-rtc: use ioremap'ed
addresses

This patch updates the rtc-ep93xx.c driver to use ioremap'ed addresses.

This removes the dependency on <mach/hardware.h> and properly reports
the memory addresses used by the driver in /proc/iomem.

In addition, ep93xx_rtc_init() is updated to use platform_driver_probe()
instead of platform_driver_register().

Also, the device_create_file() calls are now properly checked for error
conditions.  The created sysfs files are also now removed when the
driver is removed.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>

---

 		*preload = comp & 0xffff;
@@ -37,7 +40,8 @@ static int ep93xx_get_swcomp(struct device *dev,
unsigned short *preload,
 
 static int ep93xx_rtc_read_time(struct device *dev, struct rtc_time
*tm)
 {
-	unsigned long time = __raw_readl(EP93XX_RTC_DATA);
+	void __iomem *mmio_base = dev->platform_data;
+	unsigned long time = __raw_readl(mmio_base + EP93XX_RTC_DATA);
 
 	rtc_time_to_tm(time, tm);
 	return 0;
@@ -45,7 +49,9 @@ static int ep93xx_rtc_read_time(struct device *dev,
struct rtc_time *tm)
 
 static int ep93xx_rtc_set_mmss(struct device *dev, unsigned long secs)
 {
-	__raw_writel(secs + 1, EP93XX_RTC_LOAD);
+	void __iomem *mmio_base = dev->platform_data;
+	
+	__raw_writel(secs + 1, mmio_base + EP93XX_RTC_LOAD);
 	return 0;
 }
 
@@ -90,29 +96,75 @@ static ssize_t ep93xx_sysfs_show_comp_delete(struct
device *dev,
 static DEVICE_ATTR(comp_delete, S_IRUGO, ep93xx_sysfs_show_comp_delete,
NULL);
 
 
-static int __devinit ep93xx_rtc_probe(struct platform_device *dev)
+static int __init ep93xx_rtc_probe(struct platform_device *dev)
 {
-	struct rtc_device *rtc = rtc_device_register("ep93xx",
-				&dev->dev, &ep93xx_rtc_ops,
THIS_MODULE);
+	struct resource *res;
+	void __iomem *mmio_base;
+	struct rtc_device *rtc;
+	int err;
+
+	res = platform_get_resource(dev, IORESOURCE_MEM, 0);
+	if (res == NULL)
+		return -ENXIO;
+
+	res = request_mem_region(res->start, resource_size(res),
dev->name);
+	if (res == NULL)
+		return -EBUSY;
+
+	mmio_base = ioremap(res->start, resource_size(res));
+	if (mmio_base == NULL) {
+		err = -ENXIO;
+		goto fail;
+	}
+
+	dev->dev.platform_data = mmio_base;
 
+	rtc = rtc_device_register(dev->name,
+				&dev->dev, &ep93xx_rtc_ops,
THIS_MODULE);
 	if (IS_ERR(rtc)) {
-		return PTR_ERR(rtc);
+		err = PTR_ERR(rtc);
+		goto fail;
 	}
 
 	platform_set_drvdata(dev, rtc);
 
-	device_create_file(&dev->dev, &dev_attr_comp_preload);
-	device_create_file(&dev->dev, &dev_attr_comp_delete);
+	err = device_create_file(&dev->dev, &dev_attr_comp_preload);
+	if (err)
+		goto fail;
+	err = device_create_file(&dev->dev, &dev_attr_comp_delete);
+	if (err) {
+		device_remove_file(&dev->dev, &dev_attr_comp_preload);
+		goto fail;
+	}
 
 	return 0;
+
+fail:
+	if (mmio_base) {
+		iounmap(mmio_base);
+		dev->dev.platform_data = NULL;
+	}
+	release_mem_region(res->start, resource_size(res));
+	return err;
 }
 
-static int __devexit ep93xx_rtc_remove(struct platform_device *dev)
+static int __exit ep93xx_rtc_remove(struct platform_device *dev)
 {
 	struct rtc_device *rtc = platform_get_drvdata(dev);
+	void __iomem *mmio_base = dev->dev.platform_data;
+	struct resource *res;
+
+	/* cleanup sysfs */
+	device_remove_file(&dev->dev, &dev_attr_comp_delete);
+	device_remove_file(&dev->dev, &dev_attr_comp_preload);
+
+	rtc_device_unregister(rtc);
+
+	iounmap(mmio_base);
+	dev->dev.platform_data = NULL;
 
- 	if (rtc)
-		rtc_device_unregister(rtc);
+	res = platform_get_resource(dev, IORESOURCE_MEM, 0);
+	release_mem_region(res->start, resource_size(res));
 
 	platform_set_drvdata(dev, NULL);
 
@@ -122,23 +174,22 @@ static int __devexit ep93xx_rtc_remove(struct
platform_device *dev)
 /* work with hotplug and coldplug */
 MODULE_ALIAS("platform:ep93xx-rtc");
 
-static struct platform_driver ep93xx_rtc_platform_driver = {
+static struct platform_driver ep93xx_rtc_driver = {
 	.driver		= {
 		.name	= "ep93xx-rtc",
 		.owner	= THIS_MODULE,
 	},
-	.probe		= ep93xx_rtc_probe,
-	.remove		= __devexit_p(ep93xx_rtc_remove),
+	.remove		= __exit_p(ep93xx_rtc_remove),
 };
 
 static int __init ep93xx_rtc_init(void)
 {
-	return platform_driver_register(&ep93xx_rtc_platform_driver);
+        return platform_driver_probe(&ep93xx_rtc_driver,
ep93xx_rtc_probe);
 }
 
 static void __exit ep93xx_rtc_exit(void)
 {
-	platform_driver_unregister(&ep93xx_rtc_platform_driver);
+	platform_driver_unregister(&ep93xx_rtc_driver);
 }
 
 MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>"); 

--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to "rtc-linux".
Membership options at http://groups.google.com/group/rtc-linux .
Please read http://groups.google.com/group/rtc-linux/web/checklist
before submitting a driver.
-~----------~----~----~----~------~----~------~--~---

On Mon, 9 Mar 2009 12:42:32 -0400
"H Hartley Sweeten" <hartleys@visionengravers.com> wrote:

> Any comments on this patch?
> 
> Regards,
> Hartley 


 Haven't reviewed it but seems ok, I'll send
 it in with the next merge window

On Monday, March 09, 2009 9:45 AM, Alessandro Zummo wrote:
>> Any comments on this patch?
>
> Haven't reviewed it but seems ok, I'll send
> it in with the next merge window

I didn't modify the DRV_VERSION. I will leave that decision up to you.

Thanks,
Hartley

--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to "rtc-linux".
Membership options at http://groups.google.com/group/rtc-linux .
Please read http://groups.google.com/group/rtc-linux/web/checklist
before submitting a driver.
-~----------~----~----~----~------~----~------~--~---