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

Commit 605eb8b3 authored by Mike Frysinger's avatar Mike Frysinger Committed by Linus Torvalds
Browse files

blackfin RTC driver: don't bother passing the rtc struct down to... 


blackfin RTC driver: don't bother passing the rtc struct down to bfin_rtc_int_{set,clear} since it isnt needed (shaves off ~100bytes)

Signed-off-by: default avatarMike Frysinger <vapier.adi@gmail.com>
Signed-off-by: default avatarBryan Wu <bryan.wu@analog.com>
Signed-off-by: default avatarBryan Wu <cooloney@kernel.org>
Cc: David Brownell <david-b@pacbell.net>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 813006f4

drivers/rtc/rtc-bfin.c

+9 −11
Original line number Diff line number Diff line
@@ -238,12 +238,12 @@ static void bfin_rtc_release(struct device *dev) 
	free_irq(IRQ_RTC, dev);

}



static void bfin_rtc_int_set(struct bfin_rtc *rtc, u16 rtc_int)

static void bfin_rtc_int_set(u16 rtc_int)

{

	bfin_write_RTC_ISTAT(rtc_int);

	bfin_write_RTC_ICTL(bfin_read_RTC_ICTL() | rtc_int);

}

static void bfin_rtc_int_clear(struct bfin_rtc *rtc, u16 rtc_int)

static void bfin_rtc_int_clear(u16 rtc_int)

{

	bfin_write_RTC_ICTL(bfin_read_RTC_ICTL() & rtc_int);

}
@@ -252,7 +252,7 @@ static void bfin_rtc_int_set_alarm(struct bfin_rtc *rtc) 
	/* Blackfin has different bits for whether the alarm is

	 * more than 24 hours away.

	 */

	bfin_rtc_int_set(rtc, (rtc->rtc_alarm.tm_yday == -1 ? RTC_ISTAT_ALARM : RTC_ISTAT_ALARM_DAY));

	bfin_rtc_int_set(rtc->rtc_alarm.tm_yday == -1 ? RTC_ISTAT_ALARM : RTC_ISTAT_ALARM_DAY);

}

static int bfin_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long arg)

{
@@ -266,21 +266,21 @@ static int bfin_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long ar 
	switch (cmd) {

	case RTC_PIE_ON:

		dev_dbg_stamp(dev);

		bfin_rtc_int_set(rtc, RTC_ISTAT_STOPWATCH);

		bfin_rtc_int_set(RTC_ISTAT_STOPWATCH);

		bfin_write_RTC_SWCNT(rtc->rtc_dev->irq_freq);

		break;

	case RTC_PIE_OFF:

		dev_dbg_stamp(dev);

		bfin_rtc_int_clear(rtc, ~RTC_ISTAT_STOPWATCH);

		bfin_rtc_int_clear(~RTC_ISTAT_STOPWATCH);

		break;



	case RTC_UIE_ON:

		dev_dbg_stamp(dev);

		bfin_rtc_int_set(rtc, RTC_ISTAT_SEC);

		bfin_rtc_int_set(RTC_ISTAT_SEC);

		break;

	case RTC_UIE_OFF:

		dev_dbg_stamp(dev);

		bfin_rtc_int_clear(rtc, ~RTC_ISTAT_SEC);

		bfin_rtc_int_clear(~RTC_ISTAT_SEC);

		break;



	case RTC_AIE_ON:
@@ -289,7 +289,7 @@ static int bfin_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long ar 
		break;

	case RTC_AIE_OFF:

		dev_dbg_stamp(dev);

		bfin_rtc_int_clear(rtc, ~(RTC_ISTAT_ALARM | RTC_ISTAT_ALARM_DAY));

		bfin_rtc_int_clear(~(RTC_ISTAT_ALARM | RTC_ISTAT_ALARM_DAY));

		break;



	default:
@@ -435,12 +435,10 @@ static int __devexit bfin_rtc_remove(struct platform_device *pdev) 
#ifdef CONFIG_PM

static int bfin_rtc_suspend(struct platform_device *pdev, pm_message_t state)

{

	struct bfin_rtc *rtc = dev_get_drvdata(&pdev->dev);



	if (device_may_wakeup(&pdev->dev))

		enable_irq_wake(IRQ_RTC);

	else

		bfin_rtc_int_clear(rtc, -1);

		bfin_rtc_int_clear(-1);



	return 0;

}