block: add __must_check for *add_disk*() callers

Now that we have done a spring cleaning on all drivers and added
error checking / handling, let's keep it that way and ensure
no new drivers fail to stick with it.

Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>

2 files changed, 15 insertions, 11 deletions

diff --git a/block/genhd.c b/block/genhd.c
index ca6393df09ada..887385d9d575b 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -531,9 +531,10 @@ exit_del_device:
  * with the kernel.
  *
  */
-static int __device_add_disk(struct device *parent, struct gendisk *disk,
-			     const struct attribute_group **groups,
-			     bool register_queue)
+static int __must_check __device_add_disk(struct device *parent,
+					  struct gendisk *disk,
+					  const struct attribute_group **groups,
+					  bool register_queue)
 {
 	int ret;
 
@@ -651,15 +652,16 @@ exit_free_ext_minor:
 	return ret;
 }
 
-int device_add_disk(struct device *parent, struct gendisk *disk,
-		    const struct attribute_group **groups)
+int __must_check device_add_disk(struct device *parent, struct gendisk *disk,
+				 const struct attribute_group **groups)
 
 {
 	return __device_add_disk(parent, disk, groups, true);
 }
 EXPORT_SYMBOL(device_add_disk);
 
-int device_add_disk_no_queue_reg(struct device *parent, struct gendisk *disk)
+int __must_check device_add_disk_no_queue_reg(struct device *parent,
+					      struct gendisk *disk)
 {
 	return __device_add_disk(parent, disk, NULL, false);
 }
diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index 9db56d4562aef..4f96315dc0100 100644
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -219,14 +219,16 @@ static inline dev_t disk_devt(struct gendisk *disk)
 void disk_uevent(struct gendisk *disk, enum kobject_action action);
 
 /* block/genhd.c */
-extern int device_add_disk(struct device *parent, struct gendisk *disk,
-			   const struct attribute_group **groups);
-static inline int add_disk(struct gendisk *disk)
+extern int __must_check device_add_disk(struct device *parent,
+					struct gendisk *disk,
+					const struct attribute_group **groups);
+static inline int __must_check add_disk(struct gendisk *disk)
 {
 	return device_add_disk(NULL, disk, NULL);
 }
-extern int device_add_disk_no_queue_reg(struct device *parent, struct gendisk *disk);
-static inline int add_disk_no_queue_reg(struct gendisk *disk)
+extern int __must_check device_add_disk_no_queue_reg(struct device *parent,
+						     struct gendisk *disk);
+static inline int  __must_check add_disk_no_queue_reg(struct gendisk *disk)
 {
 	return device_add_disk_no_queue_reg(NULL, disk);
 }