lkml.org 
[lkml]   [2018]   [Feb]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 093/100] rtc: s35390a: remove useless indirection
    Date
    s35390a_set_datetime, s35390a_get_datetime, s35390a_set_alarm and
    s35390a_read_alarm are only used after casting dev to an i2c_client. Remove
    that useless indirection.

    Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
    ---
    drivers/rtc/rtc-s35390a.c | 32 ++++++++------------------------
    1 file changed, 8 insertions(+), 24 deletions(-)

    diff --git a/drivers/rtc/rtc-s35390a.c b/drivers/rtc/rtc-s35390a.c
    index 18c1d8a9f447..77feb603cd4c 100644
    --- a/drivers/rtc/rtc-s35390a.c
    +++ b/drivers/rtc/rtc-s35390a.c
    @@ -210,8 +210,9 @@ static int s35390a_reg2hr(struct s35390a *s35390a, char reg)
    return hour;
    }

    -static int s35390a_set_datetime(struct i2c_client *client, struct rtc_time *tm)
    +static int s35390a_rtc_set_time(struct device *dev, struct rtc_time *tm)
    {
    + struct i2c_client *client = to_i2c_client(dev);
    struct s35390a *s35390a = i2c_get_clientdata(client);
    int i, err;
    char buf[7], status;
    @@ -241,8 +242,9 @@ static int s35390a_set_datetime(struct i2c_client *client, struct rtc_time *tm)
    return err;
    }

    -static int s35390a_get_datetime(struct i2c_client *client, struct rtc_time *tm)
    +static int s35390a_rtc_read_time(struct device *dev, struct rtc_time *tm)
    {
    + struct i2c_client *client = to_i2c_client(dev);
    struct s35390a *s35390a = i2c_get_clientdata(client);
    char buf[7], status;
    int i, err;
    @@ -274,8 +276,9 @@ static int s35390a_get_datetime(struct i2c_client *client, struct rtc_time *tm)
    return 0;
    }

    -static int s35390a_set_alarm(struct i2c_client *client, struct rtc_wkalrm *alm)
    +static int s35390a_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alm)
    {
    + struct i2c_client *client = to_i2c_client(dev);
    struct s35390a *s35390a = i2c_get_clientdata(client);
    char buf[3], sts = 0;
    int err, i;
    @@ -329,8 +332,9 @@ static int s35390a_set_alarm(struct i2c_client *client, struct rtc_wkalrm *alm)
    return err;
    }

    -static int s35390a_read_alarm(struct i2c_client *client, struct rtc_wkalrm *alm)
    +static int s35390a_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alm)
    {
    + struct i2c_client *client = to_i2c_client(dev);
    struct s35390a *s35390a = i2c_get_clientdata(client);
    char buf[3], sts;
    int i, err;
    @@ -384,26 +388,6 @@ static int s35390a_read_alarm(struct i2c_client *client, struct rtc_wkalrm *alm)
    return 0;
    }

    -static int s35390a_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alm)
    -{
    - return s35390a_read_alarm(to_i2c_client(dev), alm);
    -}
    -
    -static int s35390a_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alm)
    -{
    - return s35390a_set_alarm(to_i2c_client(dev), alm);
    -}
    -
    -static int s35390a_rtc_read_time(struct device *dev, struct rtc_time *tm)
    -{
    - return s35390a_get_datetime(to_i2c_client(dev), tm);
    -}
    -
    -static int s35390a_rtc_set_time(struct device *dev, struct rtc_time *tm)
    -{
    - return s35390a_set_datetime(to_i2c_client(dev), tm);
    -}
    -
    static int s35390a_rtc_ioctl(struct device *dev, unsigned int cmd,
    unsigned long arg)
    {
    --
    2.16.1
    \
     
     \ /
      Last update: 2018-02-21 22:05    [W:4.206 / U:0.124 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site