Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2bfc3305 authored by Alessandro Zummo's avatar Alessandro Zummo Committed by Paul Mundt
Browse files

rtc: rtc-ds1302 fixes 



- removed spinlock protection, it's handled by the rtc class
- use platform_driver_probe
- return appropriate code for rtc_read_time
- style issues

Signed-off-by: default avatarAlessandro Zummo <a.zummo@towertech.it>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 307646c9

drivers/rtc/rtc-ds1302.c

+15 −51
Original line number Diff line number Diff line
@@ -8,19 +8,18 @@ 
 * License version 2. See the file "COPYING" in the main directory of

 * this archive for more details.

 */



#include <linux/init.h>

#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/platform_device.h>

#include <linux/time.h>

#include <linux/rtc.h>

#include <linux/spinlock.h>

#include <linux/io.h>

#include <linux/bcd.h>

#include <asm/rtc.h>



#define DRV_NAME	"rtc-ds1302"

#define DRV_VERSION	"0.1.0"

#define DRV_VERSION	"0.1.1"



#define	RTC_CMD_READ	0x81		/* Read command */

#define	RTC_CMD_WRITE	0x80		/* Write command */
@@ -47,11 +46,6 @@ 
#error "Add support for your platform"

#endif



struct ds1302_rtc {

	struct rtc_device *rtc_dev;

	spinlock_t lock;

};



static void ds1302_sendbits(unsigned int val)

{

	int i;
@@ -105,8 +99,6 @@ static int ds1302_rtc_read_time(struct device *dev, struct rtc_time *tm) 
{

	struct ds1302_rtc *rtc = dev_get_drvdata(dev);



	spin_lock_irq(&rtc->lock);



	tm->tm_sec	= bcd2bin(ds1302_readbyte(RTC_ADDR_SEC));

	tm->tm_min	= bcd2bin(ds1302_readbyte(RTC_ADDR_MIN));

	tm->tm_hour	= bcd2bin(ds1302_readbyte(RTC_ADDR_HOUR));
@@ -118,26 +110,17 @@ static int ds1302_rtc_read_time(struct device *dev, struct rtc_time *tm) 
	if (tm->tm_year < 70)

		tm->tm_year += 100;



	spin_unlock_irq(&rtc->lock);



	dev_dbg(dev, "%s: tm is secs=%d, mins=%d, hours=%d, "

		"mday=%d, mon=%d, year=%d, wday=%d\n",

		__func__,

		tm->tm_sec, tm->tm_min, tm->tm_hour,

		tm->tm_mday, tm->tm_mon + 1, tm->tm_year, tm->tm_wday);



	if (rtc_valid_tm(tm) < 0)

		dev_err(dev, "invalid date\n");



	return 0;

	return rtc_valid_tm(tm);

}



static int ds1302_rtc_set_time(struct device *dev, struct rtc_time *tm)

{

	struct ds1302_rtc *rtc = dev_get_drvdata(dev);



	spin_lock_irq(&rtc->lock);



	/* Stop RTC */

	ds1302_writebyte(RTC_ADDR_SEC, ds1302_readbyte(RTC_ADDR_SEC) | 0x80);
@@ -152,8 +135,6 @@ static int ds1302_rtc_set_time(struct device *dev, struct rtc_time *tm) 
	/* Start RTC */

	ds1302_writebyte(RTC_ADDR_SEC, ds1302_readbyte(RTC_ADDR_SEC) & ~0x80);



	spin_unlock_irq(&rtc->lock);



	return 0;

}
@@ -170,9 +151,7 @@ static int ds1302_rtc_ioctl(struct device *dev, unsigned int cmd, 
		if (copy_from_user(&tcs_val, (int __user *)arg, sizeof(int)))

			return -EFAULT;



		spin_lock_irq(&rtc->lock);

		ds1302_writebyte(RTC_ADDR_TCR, (0xa0 | tcs_val * 0xf));

		spin_unlock_irq(&rtc->lock);

		return 0;

	}

#endif
@@ -187,9 +166,9 @@ static struct rtc_class_ops ds1302_rtc_ops = { 
	.ioctl		= ds1302_rtc_ioctl,

};



static int __devinit ds1302_rtc_probe(struct platform_device *pdev)

static int __init ds1302_rtc_probe(struct platform_device *pdev)

{

	struct ds1302_rtc *rtc;

	struct rtc_device *rtc;

	int ret;



	/* Reset */
@@ -200,37 +179,23 @@ static int __devinit ds1302_rtc_probe(struct platform_device *pdev) 
	if (ds1302_readbyte(RTC_ADDR_RAM0) != 0x42)

		return -ENODEV;



	rtc = kzalloc(sizeof(struct ds1302_rtc), GFP_KERNEL);

	if (unlikely(!rtc))

		return -ENOMEM;



	spin_lock_init(&rtc->lock);

	rtc->rtc_dev = rtc_device_register("ds1302", &pdev->dev,

	rtc = rtc_device_register("ds1302", &pdev->dev,

					   &ds1302_rtc_ops, THIS_MODULE);

	if (IS_ERR(rtc->rtc_dev)) {

		ret = PTR_ERR(rtc->rtc_dev);

		goto out;

	}

	if (IS_ERR(rtc))

		return PTR_ERR(rtc);



	platform_set_drvdata(pdev, rtc);



	return 0;

out:

	kfree(rtc);

	return ret;

}



static int __devexit ds1302_rtc_remove(struct platform_device *pdev)

{

	struct ds1302_rtc *rtc = platform_get_drvdata(pdev);



	if (likely(rtc->rtc_dev))

		rtc_device_unregister(rtc->rtc_dev);

	struct rtc_device *rtc = platform_get_drvdata(pdev);



	rtc_device_unregister(rtc);

	platform_set_drvdata(pdev, NULL);



	kfree(rtc);



	return 0;

}
@@ -239,13 +204,12 @@ static struct platform_driver ds1302_platform_driver = { 
		.name	= DRV_NAME,

		.owner	= THIS_MODULE,

	},

	.probe		= ds1302_rtc_probe,

	.remove		= __devexit_p(ds1302_rtc_remove),

	.remove		= __exit_p(ds1302_rtc_remove),

};



static int __init ds1302_rtc_init(void)

{

	return platform_driver_register(&ds1302_platform_driver);

	return platform_driver_probe(&ds1302_platform_driver, ds1302_rtc_probe);

}



static void __exit ds1302_rtc_exit(void)