diff options
| -rw-r--r-- | drivers/i2c/chips/pcf50633.c | 28 | ||||
| -rw-r--r-- | sound/soc/codecs/wm8753.c | 2 |
2 files changed, 15 insertions, 15 deletions
diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c index 991e48fa96a..9ae53ac9949 100644 --- a/drivers/i2c/chips/pcf50633.c +++ b/drivers/i2c/chips/pcf50633.c @@ -1701,24 +1701,24 @@ struct pcf50633_time { static void pcf2rtc_time(struct rtc_time *rtc, struct pcf50633_time *pcf) { - rtc->tm_sec = BCD2BIN(pcf->time[PCF50633_TI_SEC]); - rtc->tm_min = BCD2BIN(pcf->time[PCF50633_TI_MIN]); - rtc->tm_hour = BCD2BIN(pcf->time[PCF50633_TI_HOUR]); - rtc->tm_wday = BCD2BIN(pcf->time[PCF50633_TI_WKDAY]); - rtc->tm_mday = BCD2BIN(pcf->time[PCF50633_TI_DAY]); - rtc->tm_mon = BCD2BIN(pcf->time[PCF50633_TI_MONTH]); - rtc->tm_year = BCD2BIN(pcf->time[PCF50633_TI_YEAR]) + 100; + rtc->tm_sec = bcd2bin(pcf->time[PCF50633_TI_SEC]); + rtc->tm_min = bcd2bin(pcf->time[PCF50633_TI_MIN]); + rtc->tm_hour = bcd2bin(pcf->time[PCF50633_TI_HOUR]); + rtc->tm_wday = bcd2bin(pcf->time[PCF50633_TI_WKDAY]); + rtc->tm_mday = bcd2bin(pcf->time[PCF50633_TI_DAY]); + rtc->tm_mon = bcd2bin(pcf->time[PCF50633_TI_MONTH]); + rtc->tm_year = bcd2bin(pcf->time[PCF50633_TI_YEAR]) + 100; } static void rtc2pcf_time(struct pcf50633_time *pcf, struct rtc_time *rtc) { - pcf->time[PCF50633_TI_SEC] = BIN2BCD(rtc->tm_sec); - pcf->time[PCF50633_TI_MIN] = BIN2BCD(rtc->tm_min); - pcf->time[PCF50633_TI_HOUR] = BIN2BCD(rtc->tm_hour); - pcf->time[PCF50633_TI_WKDAY] = BIN2BCD(rtc->tm_wday); - pcf->time[PCF50633_TI_DAY] = BIN2BCD(rtc->tm_mday); - pcf->time[PCF50633_TI_MONTH] = BIN2BCD(rtc->tm_mon); - pcf->time[PCF50633_TI_YEAR] = BIN2BCD(rtc->tm_year - 100); + pcf->time[PCF50633_TI_SEC] = bin2bcd(rtc->tm_sec); + pcf->time[PCF50633_TI_MIN] = bin2bcd(rtc->tm_min); + pcf->time[PCF50633_TI_HOUR] = bin2bcd(rtc->tm_hour); + pcf->time[PCF50633_TI_WKDAY] = bin2bcd(rtc->tm_wday); + pcf->time[PCF50633_TI_DAY] = bin2bcd(rtc->tm_mday); + pcf->time[PCF50633_TI_MONTH] = bin2bcd(rtc->tm_mon); + pcf->time[PCF50633_TI_YEAR] = bin2bcd(rtc->tm_year - 100); } static int pcf50633_rtc_ioctl(struct device *dev, unsigned int cmd, diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c index 85d10ff43dc..04553e22575 100644 --- a/sound/soc/codecs/wm8753.c +++ b/sound/soc/codecs/wm8753.c @@ -1773,7 +1773,7 @@ static int wm8753_probe(struct platform_device *pdev) #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) if (setup->i2c_address) { codec->hw_write = (hw_write_t)i2c_master_send; - ret = wm8753_add_i2c_device(pdev, setup); + ret = add_i2c_device(pdev, setup); } #endif #if defined(CONFIG_SPI_MASTER) |