Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

rtc: msm6242: Remove unneeded msm6242_set()/msm6242_clear() functions

The msm6242_set()/msm6242_clear() functions are used when writing to Control
Register D to set or clear the HOLD bit when reading the current time from
the RTC.

Doing this with a read-modify-write cycle will potentially clear an
interrupt condition which occurs between the read and the write.

The datasheet states the following about this:

When writing the HOLD or 30 second adjust bits of register D, it is
necessary to write the IRQ FLAG bit to a "1".

Since the only other bits in the register are the 30 second adjust bit
(which is not used) and the BUSY bit (which is read-only), the
read-modify-write cycle can be replaced by a simple write with the IRQ FLAG
bit set to 1 and the other bits (except HOLD) set to 0.

Tested-by: Kars de Jong <jongk@linux-m68k.org>
Signed-off-by: Kars de Jong <jongk@linux-m68k.org>
Link: https://lore.kernel.org/r/20191116114620.9193-1-jongk@linux-m68k.org
Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>

authored by

Kars de Jong and committed by
Alexandre Belloni
32c4d9e8 e34494c8

+4 -16
+4 -16
drivers/rtc/rtc-msm6242.c
··· 88 88 __raw_writel(val, &priv->regs[reg]); 89 89 } 90 90 91 - static inline void msm6242_set(struct msm6242_priv *priv, unsigned int val, 92 - unsigned int reg) 93 - { 94 - msm6242_write(priv, msm6242_read(priv, reg) | val, reg); 95 - } 96 - 97 - static inline void msm6242_clear(struct msm6242_priv *priv, unsigned int val, 98 - unsigned int reg) 99 - { 100 - msm6242_write(priv, msm6242_read(priv, reg) & ~val, reg); 101 - } 102 - 103 91 static void msm6242_lock(struct msm6242_priv *priv) 104 92 { 105 93 int cnt = 5; 106 94 107 - msm6242_set(priv, MSM6242_CD_HOLD, MSM6242_CD); 95 + msm6242_write(priv, MSM6242_CD_HOLD|MSM6242_CD_IRQ_FLAG, MSM6242_CD); 108 96 109 97 while ((msm6242_read(priv, MSM6242_CD) & MSM6242_CD_BUSY) && cnt) { 110 - msm6242_clear(priv, MSM6242_CD_HOLD, MSM6242_CD); 98 + msm6242_write(priv, MSM6242_CD_IRQ_FLAG, MSM6242_CD); 111 99 udelay(70); 112 - msm6242_set(priv, MSM6242_CD_HOLD, MSM6242_CD); 100 + msm6242_write(priv, MSM6242_CD_HOLD|MSM6242_CD_IRQ_FLAG, MSM6242_CD); 113 101 cnt--; 114 102 } 115 103 ··· 108 120 109 121 static void msm6242_unlock(struct msm6242_priv *priv) 110 122 { 111 - msm6242_clear(priv, MSM6242_CD_HOLD, MSM6242_CD); 123 + msm6242_write(priv, MSM6242_CD_IRQ_FLAG, MSM6242_CD); 112 124 } 113 125 114 126 static int msm6242_read_time(struct device *dev, struct rtc_time *tm)