Skip to contentSkip to conversation

zram: use ATTRIBUTE_GROUPS

PATCH Applied Luis Chamberlain 3 participants 4 messages Oct 28, 2021 – Nov 4, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 zram: use ATTRIBUTE_GROUPS

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

---
 drivers/block/zram/zram_drv.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)
drivers/block/zram/zram_drv.c +2 -9
index fcaf2750f68f..268f727f7cba 100644
@@ -1874,14 +1874,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
@@ -1953,7 +1946,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);
-	device_add_disk(NULL, zram->disk, zram_disk_attr_groups);
+	device_add_disk(NULL, zram->disk, zram_disk_groups);
 
 	strlcpy(zram->compressor, default_compressor, sizeof(zram->compressor));
 
Signature · 1 line
2.33.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 30 lines · Luis Chamberlain

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

---
  drivers/block/zram/zram_drv.c | 11 ++---------
  1 file changed, 2 insertions(+), 9 deletions(-)
drivers/block/zram/zram_drv.c +1 -8
index fcaf2750f68f..268f727f7cba 100644
@@ -1874,14 +1874,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

drivers/block/zram/zram_drv.c static int zram_add(void) · line 1952

Quoted 8 lines
drivers/block/zram/zram_drv.c +1 -1
@@ -1953,7 +1946,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);
-	device_add_disk(NULL, zram->disk, zram_disk_attr_groups);
+	device_add_disk(NULL, zram->disk, zram_disk_groups);
 
  	strlcpy(zram->compressor, default_compressor, sizeof(zram->compressor));