diff options
| author |   Alexandre Belloni <alexandre.belloni@bootlin.com> | 2018-02-12 23:47:29 +0100 |
|---|---|---|
| committer | Alexandre Belloni <alexandre.belloni@bootlin.com> | 2018-03-01 10:49:20 +0100 |
| commit | 24849d177c63e3f9b2bd92eb5c17c7ee0da4d798 (patch) | |
| tree | a7364aaa94d68770f5de161561b8d74cddcf055d /drivers/rtc/rtc-pcf85363.c | |
| parent | rtc: omap: call rtc_nvmem_register() (diff) | |
| download | linux-dev-24849d177c63e3f9b2bd92eb5c17c7ee0da4d798.tar.xz linux-dev-24849d177c63e3f9b2bd92eb5c17c7ee0da4d798.zip | |
rtc: pcf85363: call rtc_nvmem_register()
Call rtc_nvmem_register instead of letting the core do it and stop using
the nvmem_config member of struct rtc_device.
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Diffstat (limited to 'drivers/rtc/rtc-pcf85363.c')
| -rw-r--r-- | drivers/rtc/rtc-pcf85363.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/rtc/rtc-pcf85363.c b/drivers/rtc/rtc-pcf85363.c index ea04e9f0930b..a1fe833d2431 100644 --- a/drivers/rtc/rtc-pcf85363.c +++ b/drivers/rtc/rtc-pcf85363.c @@ -164,6 +164,7 @@ static int pcf85363_probe(struct i2c_client *client, const struct i2c_device_id *id) { struct pcf85363 *pcf85363; + int ret; if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) return -ENODEV; @@ -193,10 +194,13 @@ static int pcf85363_probe(struct i2c_client *client, pcf85363->nvmem_cfg.reg_read = pcf85363_nvram_read; pcf85363->nvmem_cfg.reg_write = pcf85363_nvram_write; pcf85363->nvmem_cfg.priv = pcf85363; - pcf85363->rtc->nvmem_config = &pcf85363->nvmem_cfg; pcf85363->rtc->ops = &rtc_ops; - return rtc_register_device(pcf85363->rtc); + ret = rtc_register_device(pcf85363->rtc); + + rtc_nvmem_register(pcf85363->rtc, &pcf85363->nvmem_cfg); + + return ret; } static const struct of_device_id dev_ids[] = { |