[PATCH] rtc: rtc-vr41xx: remove unused function

[PATCH] rtc: rtc-vr41xx: remove unused function

[Sudip Mukherjee]

We were getting build warning about:
drivers/rtc/rtc-vr41xx.c:228:12: warning: ‘vr41xx_rtc_alarm_irq_enable’
defined but not used

The function vr41xx_rtc_alarm_irq_enable() was not used anywhere.

Signed-off-by: Sudip Mukherjee <sudip.mukherjee@codethink.co.uk>
---

build log is at:
https://travis-ci.org/sudipm-mukherjee/parport/jobs/112780206

 drivers/rtc/rtc-vr41xx.c | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/drivers/rtc/rtc-vr41xx.c b/drivers/rtc/rtc-vr41xx.c
index f64c282..68cb63e 100644
--- a/drivers/rtc/rtc-vr41xx.c
+++ b/drivers/rtc/rtc-vr41xx.c
@@ -225,24 +225,6 @@ static int vr41xx_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long
 	return 0;
 }
 
-static int vr41xx_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled)
-{
-	spin_lock_irq(&rtc_lock);
-	if (enabled) {
-		if (!alarm_enabled) {
-			enable_irq(aie_irq);
-			alarm_enabled = 1;
-		}
-	} else {
-		if (alarm_enabled) {
-			disable_irq(aie_irq);
-			alarm_enabled = 0;
-		}
-	}
-	spin_unlock_irq(&rtc_lock);
-	return 0;
-}
-
 static irqreturn_t elapsedtime_interrupt(int irq, void *dev_id)
 {
 	struct platform_device *pdev = (struct platform_device *)dev_id;
-- 
1.9.1

Re: [PATCH] rtc: rtc-vr41xx: remove unused function

[Thierry Reding]

[-- Attachment #1: Type: text/plain, Size: 2624 bytes --]

On Tue, Mar 01, 2016 at 06:26:21PM +0530, Sudip Mukherjee wrote:
> We were getting build warning about:
> drivers/rtc/rtc-vr41xx.c:228:12: warning: ‘vr41xx_rtc_alarm_irq_enable’
> defined but not used
> 
> The function vr41xx_rtc_alarm_irq_enable() was not used anywhere.
> 
> Signed-off-by: Sudip Mukherjee <sudip.mukherjee@codethink.co.uk>
> ---
> 
> build log is at:
> https://travis-ci.org/sudipm-mukherjee/parport/jobs/112780206
> 
>  drivers/rtc/rtc-vr41xx.c | 18 ------------------
>  1 file changed, 18 deletions(-)
> 
> diff --git a/drivers/rtc/rtc-vr41xx.c b/drivers/rtc/rtc-vr41xx.c
> index f64c282..68cb63e 100644
> --- a/drivers/rtc/rtc-vr41xx.c
> +++ b/drivers/rtc/rtc-vr41xx.c
> @@ -225,24 +225,6 @@ static int vr41xx_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long
>  	return 0;
>  }
>  
> -static int vr41xx_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled)
> -{
> -	spin_lock_irq(&rtc_lock);
> -	if (enabled) {
> -		if (!alarm_enabled) {
> -			enable_irq(aie_irq);
> -			alarm_enabled = 1;
> -		}
> -	} else {
> -		if (alarm_enabled) {
> -			disable_irq(aie_irq);
> -			alarm_enabled = 0;
> -		}
> -	}
> -	spin_unlock_irq(&rtc_lock);
> -	return 0;
> -}
> -

I don't think it's supposed to be unused, rather back at the time it
simply wasn't hooked up to the rtc_class_ops.

Here's what I used.

Thierry

--- >8 ---
From 91c39e61b10551f8fbdb55cadbc29a104071bea2 Mon Sep 17 00:00:00 2001
From: Thierry Reding <treding@nvidia.com>
Date: Tue, 1 Mar 2016 15:50:25 +0100
Subject: [PATCH] rtc: vr41xx: Hook up ->alarm_irq_enable()

The vr41xx_rtc_alarm_irq_enable() function was extracted in commit
16380c153a69 ("RTC: Convert rtc drivers to use the alarm_irq_enable
method") from a more generic IOCTL handler. However the function was
never hooked up to the struct rtc_class_ops to which a new callback
had earlier been added for this purpose in commit 099e657625e8 ("rtc:
add alarm/update irq interfaces").

Signed-off-by: Thierry Reding <treding@nvidia.com>
---
 drivers/rtc/rtc-vr41xx.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/rtc/rtc-vr41xx.c b/drivers/rtc/rtc-vr41xx.c
index f64c282275b3..898fdd03668d 100644
--- a/drivers/rtc/rtc-vr41xx.c
+++ b/drivers/rtc/rtc-vr41xx.c
@@ -278,6 +278,7 @@ static const struct rtc_class_ops vr41xx_rtc_ops = {
 	.set_time	= vr41xx_rtc_set_time,
 	.read_alarm	= vr41xx_rtc_read_alarm,
 	.set_alarm	= vr41xx_rtc_set_alarm,
+	.alarm_irq_enable = vr41xx_rtc_alarm_irq_enable,
 };
 
 static int rtc_probe(struct platform_device *pdev)
-- 
2.7.1

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH] rtc: rtc-vr41xx: remove unused function

[Alexandre Belloni]

On 01/03/2016 at 15:55:58 +0100, Thierry Reding wrote :
> On Tue, Mar 01, 2016 at 06:26:21PM +0530, Sudip Mukherjee wrote:
> > We were getting build warning about:
> > drivers/rtc/rtc-vr41xx.c:228:12: warning: ‘vr41xx_rtc_alarm_irq_enable’
> > defined but not used
> > 
> > The function vr41xx_rtc_alarm_irq_enable() was not used anywhere.
> > 
> > Signed-off-by: Sudip Mukherjee <sudip.mukherjee@codethink.co.uk>
> > ---
> > 
> > build log is at:
> > https://travis-ci.org/sudipm-mukherjee/parport/jobs/112780206
> > 
> >  drivers/rtc/rtc-vr41xx.c | 18 ------------------
> >  1 file changed, 18 deletions(-)
> > 
> > diff --git a/drivers/rtc/rtc-vr41xx.c b/drivers/rtc/rtc-vr41xx.c
> > index f64c282..68cb63e 100644
> > --- a/drivers/rtc/rtc-vr41xx.c
> > +++ b/drivers/rtc/rtc-vr41xx.c
> > @@ -225,24 +225,6 @@ static int vr41xx_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long
> >  	return 0;
> >  }
> >  
> > -static int vr41xx_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled)
> > -{
> > -	spin_lock_irq(&rtc_lock);
> > -	if (enabled) {
> > -		if (!alarm_enabled) {
> > -			enable_irq(aie_irq);
> > -			alarm_enabled = 1;
> > -		}
> > -	} else {
> > -		if (alarm_enabled) {
> > -			disable_irq(aie_irq);
> > -			alarm_enabled = 0;
> > -		}
> > -	}
> > -	spin_unlock_irq(&rtc_lock);
> > -	return 0;
> > -}
> > -
> 
> I don't think it's supposed to be unused, rather back at the time it
> simply wasn't hooked up to the rtc_class_ops.
> 
> Here's what I used.
> 

I've already applied the patch from Geert which does the same.


-- 
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com