On 07 May 2014 21:01, Andrew Morton [mailto:a...@linux-foundation.org] wrote: > >So how does this look? > >--- a/drivers/rtc/rtc-da9063.c~rtc-da9063-rtc-driver-fix >+++ a/drivers/rtc/rtc-da9063.c >@@ -82,6 +82,7 @@ static void da9063_tm_to_data(struct rtc > static int da9063_rtc_stop_alarm(struct device *dev) > { > struct da9063_rtc *rtc = dev_get_drvdata(dev); >+ > return regmap_update_bits(rtc->hw->regmap, DA9063_REG_ALARM_Y, > DA9063_ALARM_ON, 0); > } >@@ -89,6 +90,7 @@ static int da9063_rtc_stop_alarm(struct > static int da9063_rtc_start_alarm(struct device *dev) > { > struct da9063_rtc *rtc = dev_get_drvdata(dev); >+ > return regmap_update_bits(rtc->hw->regmap, DA9063_REG_ALARM_Y, > DA9063_ALARM_ON, DA9063_ALARM_ON); > } >@@ -115,13 +117,12 @@ static int da9063_rtc_read_time(struct d > > da9063_data_to_tm(data, tm); > >- (void)rtc_tm_to_time(tm, &tm_secs); >- (void)rtc_tm_to_time(&rtc->alarm_time, &al_secs); >+ rtc_tm_to_time(tm, &tm_secs); >+ rtc_tm_to_time(&rtc->alarm_time, &al_secs); > > /* handle the rtc synchronisation delay */ > if (rtc->rtc_sync == true && al_secs - tm_secs == 1) >- (void)memcpy((void *)tm, (const void *)&rtc->alarm_time, >- sizeof(struct rtc_time)); >+ memcpy(tm, &rtc->alarm_time, sizeof(struct rtc_time)); > else > rtc->rtc_sync = false; > >_
Yep: + rtc-da9063-rtc-driver.patch added to -mm tree + rtc-da9063-rtc-driver-fix.patch added to -mm tree Looks great. Thanks for reviewing, fixing and merging Regards Steve -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
