ds1685_rtc_begin_ctrl_access/ds1685_rtc_end_ctrl_access aren't used, so get rid of it.
Unified · Split
| @@ -191,42 +191,6 @@ ds1685_rtc_end_data_access(struct ds1685_priv *rtc) · 190 unmodified lines | |||
| 191 | (rtc->read(rtc, RTC_CTRL_B) & ~(RTC_CTRL_B_SET))); | 191 | (rtc->read(rtc, RTC_CTRL_B) & ~(RTC_CTRL_B_SET))); |
| 192 | } | 192 | } |
| 193 | 193 | ||
| 194 | /** | ||
| 195 | * ds1685_rtc_begin_ctrl_access - prepare the rtc for ctrl access. | ||
| 196 | * @rtc: pointer to the ds1685 rtc structure. | ||
| 197 | * @flags: irq flags variable for spin_lock_irqsave. | ||
| 198 | * | ||
| 199 | * This takes several steps to prepare the rtc for access to read just the | ||
| 200 | * control registers: | ||
| 201 | * - Sets a spinlock on the rtc IRQ. | ||
| 202 | * - Switches the rtc to bank 1. This allows access to the two extended | ||
| 203 | * control registers. | ||
| 204 | * | ||
| 205 | * Only use this where you are certain another lock will not be held. | ||
| 206 | */ | ||
| 207 | static inline void | ||
| 208 | ds1685_rtc_begin_ctrl_access(struct ds1685_priv *rtc, unsigned long *flags) | ||
| 209 | { | ||
| 210 | spin_lock_irqsave(&rtc->lock, *flags); | ||
| 211 | ds1685_rtc_switch_to_bank1(rtc); | ||
| 212 | } | ||
| 213 | |||
| 214 | /** | ||
| 215 | * ds1685_rtc_end_ctrl_access - end ctrl access on the rtc. | ||
| 216 | * @rtc: pointer to the ds1685 rtc structure. | ||
| 217 | * @flags: irq flags variable for spin_unlock_irqrestore. | ||
| 218 | * | ||
| 219 | * This ends what was started by ds1685_rtc_begin_ctrl_access: | ||
| 220 | * - Switches the rtc back to bank 0. | ||
| 221 | * - Unsets the spinlock on the rtc IRQ. | ||
| 222 | */ | ||
| 223 | static inline void | ||
| 224 | ds1685_rtc_end_ctrl_access(struct ds1685_priv *rtc, unsigned long flags) | ||
| 225 | { | ||
| 226 | ds1685_rtc_switch_to_bank0(rtc); | ||
| 227 | spin_unlock_irqrestore(&rtc->lock, flags); | ||
| 228 | } | ||
| 229 | |||
| 230 | /** | 194 | /** |
| 231 | * ds1685_rtc_get_ssn - retrieve the silicon serial number. | 195 | * ds1685_rtc_get_ssn - retrieve the silicon serial number. |
| 232 | * @rtc: pointer to the ds1685 rtc structure. | 196 | * @rtc: pointer to the ds1685 rtc structure. |