Merge branch 'block-7.1' into for-next

* block-7.1:
  Revert "floppy: fix reference leak on platform_device_register() failure"

Author: axboe

drivers/block/floppy.c

@@ -4722,19 +4722,15 @@ static int __init do_floppy_init(void)
 		floppy_device[drive].dev.groups = floppy_dev_groups;
 
 		err = platform_device_register(&floppy_device[drive]);
-		if (err) {
-			platform_device_put(&floppy_device[drive]);
+		if (err)
 			goto out_remove_drives;
-		}
+
 		registered[drive] = true;
 
 		err = device_add_disk(&floppy_device[drive].dev,
 				      disks[drive][0], NULL);
-		if (err) {
-			platform_device_unregister(&floppy_device[drive]);
-			registered[drive] = false;
+		if (err)
 			goto out_remove_drives;
-		}
 	}
 
 	return 0;