staging/comedi/me4000: fix sparse warning "obsolete struct initializer"

[~andy/linux] / drivers / staging / zram / zram_drv.c

diff --git a/drivers/staging/zram/zram_drv.c b/drivers/staging/zram/zram_drv.c
index 5415712f01f804bf1ed432034c98e148561324bb..01d6dd9525813fe2e3dfd1e035e1e241a505ab8c 100644 (file)
--- a/drivers/staging/zram/zram_drv.c
+++ b/drivers/staging/zram/zram_drv.c
@@ -208,8 +208,7 @@ static int zram_read(struct zram *zram, struct bio *bio)
        struct bio_vec *bvec;
 
        if (unlikely(!zram->init_done)) {
-               set_bit(BIO_UPTODATE, &bio->bi_flags);
-               bio_endio(bio, 0);
+               bio_endio(bio, -ENXIO);
                return 0;
        }
 
@@ -626,14 +625,12 @@ static int create_device(struct zram *zram, int device_id)
 
        add_disk(zram->disk);
 
-#ifdef CONFIG_SYSFS
        ret = sysfs_create_group(&disk_to_dev(zram->disk)->kobj,
                                &zram_disk_attr_group);
        if (ret < 0) {
                pr_warning("Error creating sysfs group");
                goto out;
        }
-#endif
 
        zram->init_done = 0;
 
@@ -643,10 +640,8 @@ out:
 
 static void destroy_device(struct zram *zram)
 {
-#ifdef CONFIG_SYSFS
        sysfs_remove_group(&disk_to_dev(zram->disk)->kobj,
                        &zram_disk_attr_group);
-#endif
 
        if (zram->disk) {
                del_gendisk(zram->disk);