Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

[linux-2.6-microblaze.git] / drivers / nvdimm / bus.c

diff --git a/drivers/nvdimm/bus.c b/drivers/nvdimm/bus.c
index 9552656..2304c61 100644 (file)
--- a/drivers/nvdimm/bus.c
+++ b/drivers/nvdimm/bus.c
@@ -628,7 +628,7 @@ int __nd_driver_register(struct nd_device_driver *nd_drv, struct module *owner,
 }
 EXPORT_SYMBOL(__nd_driver_register);
 
-int nvdimm_revalidate_disk(struct gendisk *disk)
+void nvdimm_check_and_set_ro(struct gendisk *disk)
 {
        struct device *dev = disk_to_dev(disk)->parent;
        struct nd_region *nd_region = to_nd_region(dev->parent);
@@ -639,16 +639,13 @@ int nvdimm_revalidate_disk(struct gendisk *disk)
         * read-only if the disk is already read-only.
         */
        if (disk_ro || nd_region->ro == disk_ro)
-               return 0;
+               return;
 
        dev_info(dev, "%s read-only, marking %s read-only\n",
                        dev_name(&nd_region->dev), disk->disk_name);
        set_disk_ro(disk, 1);
-
-       return 0;
-
 }
-EXPORT_SYMBOL(nvdimm_revalidate_disk);
+EXPORT_SYMBOL(nvdimm_check_and_set_ro);
 
 static ssize_t modalias_show(struct device *dev, struct device_attribute *attr,
                char *buf)