Commit 51ba60c5 authored by John Stultz's avatar John Stultz
Browse files

RTC: Cleanup rtc_class_ops->update_irq_enable() 



Now that the generic code handles UIE mode irqs via periodic
alarm interrupts, no one calls the
rtc_class_ops->update_irq_enable() method anymore.

This patch removes the driver hooks and implementations of
update_irq_enable if no one else is calling it.

CC: Thomas Gleixner <tglx@linutronix.de>
CC: Alessandro Zummo <a.zummo@towertech.it>
CC: Marcelo Roberto Jimenez <mroberto@cpti.cetuc.puc-rio.br>
CC: rtc-linux@googlegroups.com
Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
parent 696160fe

drivers/rtc/rtc-cmos.c

+0 −20
Original line number Diff line number Diff line
@@ -394,25 +394,6 @@ static int cmos_alarm_irq_enable(struct device *dev, unsigned int enabled) 
	return 0;

}



static int cmos_update_irq_enable(struct device *dev, unsigned int enabled)

{

	struct cmos_rtc	*cmos = dev_get_drvdata(dev);

	unsigned long	flags;



	if (!is_valid_irq(cmos->irq))

		return -EINVAL;



	spin_lock_irqsave(&rtc_lock, flags);



	if (enabled)

		cmos_irq_enable(cmos, RTC_UIE);

	else

		cmos_irq_disable(cmos, RTC_UIE);



	spin_unlock_irqrestore(&rtc_lock, flags);

	return 0;

}



#if defined(CONFIG_RTC_INTF_PROC) || defined(CONFIG_RTC_INTF_PROC_MODULE)



static int cmos_procfs(struct device *dev, struct seq_file *seq)
@@ -458,7 +439,6 @@ static const struct rtc_class_ops cmos_rtc_ops = { 
	.set_alarm		= cmos_set_alarm,

	.proc			= cmos_procfs,

	.alarm_irq_enable	= cmos_alarm_irq_enable,

	.update_irq_enable	= cmos_update_irq_enable,

};



/*----------------------------------------------------------------*/

drivers/rtc/rtc-ds1511.c

+0 −17
Original line number Diff line number Diff line
@@ -397,29 +397,12 @@ static int ds1511_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled) 
	return 0;

}



static int ds1511_rtc_update_irq_enable(struct device *dev,

	unsigned int enabled)

{

	struct platform_device *pdev = to_platform_device(dev);

	struct rtc_plat_data *pdata = platform_get_drvdata(pdev);



	if (pdata->irq <= 0)

		return -EINVAL;

	if (enabled)

		pdata->irqen |= RTC_UF;

	else

		pdata->irqen &= ~RTC_UF;

	ds1511_rtc_update_alarm(pdata);

	return 0;

}



static const struct rtc_class_ops ds1511_rtc_ops = {

	.read_time		= ds1511_rtc_read_time,

	.set_time		= ds1511_rtc_set_time,

	.read_alarm		= ds1511_rtc_read_alarm,

	.set_alarm		= ds1511_rtc_set_alarm,

	.alarm_irq_enable	= ds1511_rtc_alarm_irq_enable,

	.update_irq_enable	= ds1511_rtc_update_irq_enable,

};



 static ssize_t

drivers/rtc/rtc-ds1553.c

+0 −17
Original line number Diff line number Diff line
@@ -227,29 +227,12 @@ static int ds1553_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled) 
	return 0;

}



static int ds1553_rtc_update_irq_enable(struct device *dev,

	unsigned int enabled)

{

	struct platform_device *pdev = to_platform_device(dev);

	struct rtc_plat_data *pdata = platform_get_drvdata(pdev);



	if (pdata->irq <= 0)

		return -EINVAL;

	if (enabled)

		pdata->irqen |= RTC_UF;

	else

		pdata->irqen &= ~RTC_UF;

	ds1553_rtc_update_alarm(pdata);

	return 0;

}



static const struct rtc_class_ops ds1553_rtc_ops = {

	.read_time		= ds1553_rtc_read_time,

	.set_time		= ds1553_rtc_set_time,

	.read_alarm		= ds1553_rtc_read_alarm,

	.set_alarm		= ds1553_rtc_set_alarm,

	.alarm_irq_enable	= ds1553_rtc_alarm_irq_enable,

	.update_irq_enable	= ds1553_rtc_update_irq_enable,

};



static ssize_t ds1553_nvram_read(struct file *filp, struct kobject *kobj,

drivers/rtc/rtc-ds3232.c

+0 −18
Original line number Diff line number Diff line
@@ -339,23 +339,6 @@ static int ds3232_alarm_irq_enable(struct device *dev, unsigned int enabled) 
	return 0;

}



static int ds3232_update_irq_enable(struct device *dev, unsigned int enabled)

{

	struct i2c_client *client = to_i2c_client(dev);

	struct ds3232 *ds3232 = i2c_get_clientdata(client);



	if (client->irq <= 0)

		return -EINVAL;



	if (enabled)

		ds3232->rtc->irq_data |= RTC_UF;

	else

		ds3232->rtc->irq_data &= ~RTC_UF;



	ds3232_update_alarm(client);

	return 0;

}



static irqreturn_t ds3232_irq(int irq, void *dev_id)

{

	struct i2c_client *client = dev_id;
@@ -406,7 +389,6 @@ static const struct rtc_class_ops ds3232_rtc_ops = { 
	.read_alarm = ds3232_read_alarm,

	.set_alarm = ds3232_set_alarm,

	.alarm_irq_enable = ds3232_alarm_irq_enable,

	.update_irq_enable = ds3232_update_irq_enable,

};



static int __devinit ds3232_probe(struct i2c_client *client,

drivers/rtc/rtc-jz4740.c

+0 −7
Original line number Diff line number Diff line
@@ -168,12 +168,6 @@ static int jz4740_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) 
	return ret;

}



static int jz4740_rtc_update_irq_enable(struct device *dev, unsigned int enable)

{

	struct jz4740_rtc *rtc = dev_get_drvdata(dev);

	return jz4740_rtc_ctrl_set_bits(rtc, JZ_RTC_CTRL_1HZ_IRQ, enable);

}



static int jz4740_rtc_alarm_irq_enable(struct device *dev, unsigned int enable)

{

	struct jz4740_rtc *rtc = dev_get_drvdata(dev);
@@ -185,7 +179,6 @@ static struct rtc_class_ops jz4740_rtc_ops = { 
	.set_mmss	= jz4740_rtc_set_mmss,

	.read_alarm	= jz4740_rtc_read_alarm,

	.set_alarm	= jz4740_rtc_set_alarm,

	.update_irq_enable = jz4740_rtc_update_irq_enable,

	.alarm_irq_enable = jz4740_rtc_alarm_irq_enable,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE