Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[sfrench/cifs-2.6.git] / drivers / rtc / rtc-rv8803.c

diff --git a/drivers/rtc/rtc-rv8803.c b/drivers/rtc/rtc-rv8803.c
index 9ad97ab298664c9bda5bc221aa94f9cef97173b1..aae2576741a61585a9624217fa2a6cd1d26510e1 100644 (file)
--- a/drivers/rtc/rtc-rv8803.c
+++ b/drivers/rtc/rtc-rv8803.c
@@ -68,6 +68,7 @@ struct rv8803_data {
        struct mutex flags_lock;
        u8 ctrl;
        enum rv8803_type type;
+       struct nvmem_config nvmem_cfg;
 };
 
 static int rv8803_read_reg(const struct i2c_client *client, u8 reg)
@@ -460,48 +461,32 @@ static int rv8803_ioctl(struct device *dev, unsigned int cmd, unsigned long arg)
        }
 }
 
-static ssize_t rv8803_nvram_write(struct file *filp, struct kobject *kobj,
-                                 struct bin_attribute *attr,
-                                 char *buf, loff_t off, size_t count)
+static int rv8803_nvram_write(void *priv, unsigned int offset, void *val,
+                             size_t bytes)
 {
-       struct device *dev = kobj_to_dev(kobj);
-       struct i2c_client *client = to_i2c_client(dev);
        int ret;
 
-       ret = rv8803_write_reg(client, RV8803_RAM, buf[0]);
+       ret = rv8803_write_reg(priv, RV8803_RAM, *(u8 *)val);
        if (ret)
                return ret;
 
-       return 1;
+       return 0;
 }
 
-static ssize_t rv8803_nvram_read(struct file *filp, struct kobject *kobj,
-                                struct bin_attribute *attr,
-                                char *buf, loff_t off, size_t count)
+static int rv8803_nvram_read(void *priv, unsigned int offset,
+                            void *val, size_t bytes)
 {
-       struct device *dev = kobj_to_dev(kobj);
-       struct i2c_client *client = to_i2c_client(dev);
        int ret;
 
-       ret = rv8803_read_reg(client, RV8803_RAM);
+       ret = rv8803_read_reg(priv, RV8803_RAM);
        if (ret < 0)
                return ret;
 
-       buf[0] = ret;
+       *(u8 *)val = ret;
 
-       return 1;
+       return 0;
 }
 
-static struct bin_attribute rv8803_nvram_attr = {
-       .attr = {
-               .name = "nvram",
-               .mode = S_IRUGO | S_IWUSR,
-       },
-       .size = 1,
-       .read = rv8803_nvram_read,
-       .write = rv8803_nvram_write,
-};
-
 static struct rtc_class_ops rv8803_rtc_ops = {
        .read_time = rv8803_get_time,
        .set_time = rv8803_set_time,
@@ -577,6 +562,11 @@ static int rv8803_probe(struct i2c_client *client,
        if (flags & RV8803_FLAG_AF)
                dev_warn(&client->dev, "An alarm maybe have been missed.\n");
 
+       rv8803->rtc = devm_rtc_allocate_device(&client->dev);
+       if (IS_ERR(rv8803->rtc)) {
+               return PTR_ERR(rv8803->rtc);
+       }
+
        if (client->irq > 0) {
                err = devm_request_threaded_irq(&client->dev, client->irq,
                                                NULL, rv8803_handle_irq,
@@ -592,12 +582,20 @@ static int rv8803_probe(struct i2c_client *client,
                }
        }
 
-       rv8803->rtc = devm_rtc_device_register(&client->dev, client->name,
-                                              &rv8803_rtc_ops, THIS_MODULE);
-       if (IS_ERR(rv8803->rtc)) {
-               dev_err(&client->dev, "unable to register the class device\n");
-               return PTR_ERR(rv8803->rtc);
-       }
+       rv8803->nvmem_cfg.name = "rv8803_nvram",
+       rv8803->nvmem_cfg.word_size = 1,
+       rv8803->nvmem_cfg.stride = 1,
+       rv8803->nvmem_cfg.size = 1,
+       rv8803->nvmem_cfg.reg_read = rv8803_nvram_read,
+       rv8803->nvmem_cfg.reg_write = rv8803_nvram_write,
+       rv8803->nvmem_cfg.priv = client;
+
+       rv8803->rtc->ops = &rv8803_rtc_ops;
+       rv8803->rtc->nvmem_config = &rv8803->nvmem_cfg;
+       rv8803->rtc->nvram_old_abi = true;
+       err = rtc_register_device(rv8803->rtc);
+       if (err)
+               return err;
 
        err = rv8803_write_reg(rv8803->client, RV8803_EXT, RV8803_EXT_WADA);
        if (err)
@@ -609,22 +607,11 @@ static int rv8803_probe(struct i2c_client *client,
                return err;
        }
 
-       err = device_create_bin_file(&client->dev, &rv8803_nvram_attr);
-       if (err)
-               return err;
-
        rv8803->rtc->max_user_freq = 1;
 
        return 0;
 }
 
-static int rv8803_remove(struct i2c_client *client)
-{
-       device_remove_bin_file(&client->dev, &rv8803_nvram_attr);
-
-       return 0;
-}
-
 static const struct i2c_device_id rv8803_id[] = {
        { "rv8803", rv_8803 },
        { "rx8900", rx_8900 },
@@ -651,7 +638,6 @@ static struct i2c_driver rv8803_driver = {
                .of_match_table = of_match_ptr(rv8803_of_match),
        },
        .probe          = rv8803_probe,
-       .remove         = rv8803_remove,
        .id_table       = rv8803_id,
 };
 module_i2c_driver(rv8803_driver);