From: Alexandre Belloni Date: Thu, 17 May 2018 20:33:28 +0000 (+0200) Subject: rtc: rx8581: remove useless indirection X-Git-Tag: v4.18-rc1~64^2~47 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2d2b300b3875cb76b67e5aa6ba39b58519942411;p=thirdparty%2Flinux.git rtc: rx8581: remove useless indirection rx8581_get_datetime and rx8581_set_datetime are only used after casting dev to an i2c_client. Remove that useless indirection. Signed-off-by: Alexandre Belloni --- diff --git a/drivers/rtc/rtc-rx8581.c b/drivers/rtc/rtc-rx8581.c index 171ee241bd2fd..a91fbb86a1106 100644 --- a/drivers/rtc/rtc-rx8581.c +++ b/drivers/rtc/rtc-rx8581.c @@ -93,8 +93,9 @@ static int rx8581_write_block_data(const struct i2c_client *client, u8 command, * In the routines that deal directly with the rx8581 hardware, we use * rtc_time -- month 0-11, hour 0-23, yr = calendar year-epoch. */ -static int rx8581_get_datetime(struct i2c_client *client, struct rtc_time *tm) +static int rx8581_rtc_read_time(struct device *dev, struct rtc_time *tm) { + struct i2c_client *client = to_i2c_client(dev); unsigned char date[7]; int data, err; struct rx8581 *rx8581 = i2c_get_clientdata(client); @@ -164,8 +165,9 @@ static int rx8581_get_datetime(struct i2c_client *client, struct rtc_time *tm) return 0; } -static int rx8581_set_datetime(struct i2c_client *client, struct rtc_time *tm) +static int rx8581_rtc_set_time(struct device *dev, struct rtc_time *tm) { + struct i2c_client *client = to_i2c_client(dev); int data, err; unsigned char buf[7]; struct rx8581 *rx8581 = i2c_get_clientdata(client); @@ -242,16 +244,6 @@ static int rx8581_set_datetime(struct i2c_client *client, struct rtc_time *tm) return 0; } -static int rx8581_rtc_read_time(struct device *dev, struct rtc_time *tm) -{ - return rx8581_get_datetime(to_i2c_client(dev), tm); -} - -static int rx8581_rtc_set_time(struct device *dev, struct rtc_time *tm) -{ - return rx8581_set_datetime(to_i2c_client(dev), tm); -} - static const struct rtc_class_ops rx8581_rtc_ops = { .read_time = rx8581_rtc_read_time, .set_time = rx8581_rtc_set_time,