Merge tag 'for-5.13/drivers-2021-04-27' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / drivers / s390 / block / dasd.c

diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index 3a945ab..c8df75e 100644 (file)
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -3439,15 +3439,6 @@ static void dasd_generic_auto_online(void *data, async_cookie_t cookie)
  */
 int dasd_generic_probe(struct ccw_device *cdev)
 {
-       int ret;
-
-       ret = dasd_add_sysfs_files(cdev);
-       if (ret) {
-               DBF_EVENT_DEVID(DBF_WARNING, cdev, "%s",
-                               "dasd_generic_probe: could not add "
-                               "sysfs entries");
-               return ret;
-       }
        cdev->handler = &dasd_int_handler;
 
        /*
@@ -3488,15 +3479,13 @@ void dasd_generic_remove(struct ccw_device *cdev)
        struct dasd_block *block;
 
        device = dasd_device_from_cdev(cdev);
-       if (IS_ERR(device)) {
-               dasd_remove_sysfs_files(cdev);
+       if (IS_ERR(device))
                return;
-       }
+
        if (test_and_set_bit(DASD_FLAG_OFFLINE, &device->flags) &&
            !test_bit(DASD_FLAG_SAFE_OFFLINE_RUNNING, &device->flags)) {
                /* Already doing offline processing */
                dasd_put_device(device);
-               dasd_remove_sysfs_files(cdev);
                return;
        }
        /*
@@ -3515,8 +3504,6 @@ void dasd_generic_remove(struct ccw_device *cdev)
         */
        if (block)
                dasd_free_block(block);
-
-       dasd_remove_sysfs_files(cdev);
 }
 EXPORT_SYMBOL_GPL(dasd_generic_remove);