s390/scm: Make struct scm_driver::remove return void

The driver core ignores the return value of scmdev_remove()
(because there is only little it can do when a device disappears).

So make it impossible for future drivers to return an unused error code
by changing the remove prototype to return void.

The real motivation for this change is the quest to make struct
bus_type::remove return void, too.

Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Acked-by: Vineeth Vijayan <vneethv@linux.ibm.com>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/20210713193522.1770306-5-u.kleine-koenig@pengutronix.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/s390/include/asm/eadm.h b/arch/s390/include/asm/eadm.h
index bb63b2afdf6fc1c0d8cd6628d0e0573ddc2945af..445fe4c8184a318ffe29c454053631b5dc9942c4 100644 (file)
--- a/arch/s390/include/asm/eadm.h
+++ b/arch/s390/include/asm/eadm.h
@@ -105,7 +105,7 @@ enum scm_event {SCM_CHANGE, SCM_AVAIL};
 struct scm_driver {
        struct device_driver drv;
        int (*probe) (struct scm_device *scmdev);
-       int (*remove) (struct scm_device *scmdev);
+       void (*remove) (struct scm_device *scmdev);
        void (*notify) (struct scm_device *scmdev, enum scm_event event);
        void (*handler) (struct scm_device *scmdev, void *data,
                        blk_status_t error);

diff --git a/drivers/s390/block/scm_drv.c b/drivers/s390/block/scm_drv.c
index 3134fd6e058e7fe8801894b61e5ddaf04e822a6c..69a845eb8b1f58e40fc49248bc49475f28cb342c 100644 (file)
--- a/drivers/s390/block/scm_drv.c
+++ b/drivers/s390/block/scm_drv.c
@@ -60,15 +60,13 @@ out:
        return ret;
 }
 
-static int scm_remove(struct scm_device *scmdev)
+static void scm_remove(struct scm_device *scmdev)
 {
        struct scm_blk_dev *bdev = dev_get_drvdata(&scmdev->dev);
 
        scm_blk_dev_cleanup(bdev);
        dev_set_drvdata(&scmdev->dev, NULL);
        kfree(bdev);
-
-       return 0;
 }
 
 static struct scm_driver scm_drv = {

diff --git a/drivers/s390/cio/scm.c b/drivers/s390/cio/scm.c
index 9f26d4310bb3465132132c8a15d7bfe54c1dc7c6..b31711307e5a8ec23e7de335c98d8d9038ca6514 100644 (file)
--- a/drivers/s390/cio/scm.c
+++ b/drivers/s390/cio/scm.c
@@ -33,7 +33,10 @@ static int scmdev_remove(struct device *dev)
        struct scm_device *scmdev = to_scm_dev(dev);
        struct scm_driver *scmdrv = to_scm_drv(dev->driver);
 
-       return scmdrv->remove ? scmdrv->remove(scmdev) : -ENODEV;
+       if (scmdrv->remove)
+               scmdrv->remove(scmdev);
+
+       return 0;
 }
 
 static int scmdev_uevent(struct device *dev, struct kobj_uevent_env *env)