Commit 7f0d2672 authored by Luis Chamberlain's avatar Luis Chamberlain Committed by Linus Torvalds
Browse files

zram: use ATTRIBUTE_GROUPS 

Embrace ATTRIBUTE_GROUPS to avoid boiler plate code.  This should not
introduce any functional changes.

Link: https://lkml.kernel.org/r/20211028203600.2157356-1-mcgrof@kernel.org


Signed-off-by: default avatarLuis Chamberlain <mcgrof@kernel.org>
Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Reviewed-by: default avatarSergey Senozhatsky <senozhatsky@chromium.org>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Nitin Gupta <ngupta@vflare.org>
Cc: Jens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f44e1e69

drivers/block/zram/zram_drv.c

+2 −9
Original line number Diff line number Diff line
@@ -1903,14 +1903,7 @@ static struct attribute *zram_disk_attrs[] = { 
	NULL,

};



static const struct attribute_group zram_disk_attr_group = {

	.attrs = zram_disk_attrs,

};



static const struct attribute_group *zram_disk_attr_groups[] = {

	&zram_disk_attr_group,

	NULL,

};

ATTRIBUTE_GROUPS(zram_disk);



/*

 * Allocate and initialize new zram device. the function returns
@@ -1982,7 +1975,7 @@ static int zram_add(void) 
		blk_queue_max_write_zeroes_sectors(zram->disk->queue, UINT_MAX);



	blk_queue_flag_set(QUEUE_FLAG_STABLE_WRITES, zram->disk->queue);

	ret = device_add_disk(NULL, zram->disk, zram_disk_attr_groups);

	ret = device_add_disk(NULL, zram->disk, zram_disk_groups);

	if (ret)

		goto out_cleanup_disk;