Commit 05439f1f authored by dann frazier's avatar dann frazier Committed by Linus Torvalds
Browse files

rtc-parisc: remove redundant locking 



The RTC subsystem proides ops locking, no need to implement our own

Signed-off-by: default avatardann frazier <dannf@hp.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Kyle McMartin <kyle@mcmartin.ca>
Cc: Grant Grundler <grundler@parisc-linux.org>
Cc: Matthew Wilcox <matthew@wil.cx>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 93d456d9

drivers/rtc/rtc-parisc.c

+1 −11
Original line number Diff line number Diff line
@@ -14,17 +14,13 @@ 
/* as simple as can be, and no simpler. */

struct parisc_rtc {

	struct rtc_device *rtc;

	spinlock_t lock;

};



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

{

	struct parisc_rtc *p = dev_get_drvdata(dev);

	unsigned long flags, ret;

	unsigned long ret;



	spin_lock_irqsave(&p->lock, flags);

	ret = get_rtc_time(tm);

	spin_unlock_irqrestore(&p->lock, flags);



	if (ret & RTC_BATT_BAD)

		return -EOPNOTSUPP;
@@ -34,13 +30,9 @@ static int parisc_get_time(struct device *dev, struct rtc_time *tm) 


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

{

	struct parisc_rtc *p = dev_get_drvdata(dev);

	unsigned long flags;

	int ret;



	spin_lock_irqsave(&p->lock, flags);

	ret = set_rtc_time(tm);

	spin_unlock_irqrestore(&p->lock, flags);



	if (ret < 0)

		return -EOPNOTSUPP;
@@ -61,8 +53,6 @@ static int __devinit parisc_rtc_probe(struct platform_device *dev) 
	if (!p)

		return -ENOMEM;



	spin_lock_init(&p->lock);



	p->rtc = rtc_device_register("rtc-parisc", &dev->dev, &parisc_rtc_ops,

					THIS_MODULE);

	if (IS_ERR(p->rtc)) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE