Skip to content

Commit e69dade

Browse files
JiangJiashdeller
authored andcommitted
fbdev: gbefb: Convert to use dev_groups
The driver core supports the ability to handle the creation and removal of device-specific sysfs files in a race-free manner. Moreover, it can guarantee the success of creation. Therefore, it should be better to convert to use dev_groups. Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn> Signed-off-by: Helge Deller <deller@gmx.de>
1 parent d13189b commit e69dade

File tree

1 file changed

+7
-13
lines changed

1 file changed

+7
-13
lines changed

drivers/video/fbdev/gbefb.c

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1072,17 +1072,12 @@ static ssize_t gbefb_show_rev(struct device *device, struct device_attribute *at
10721072

10731073
static DEVICE_ATTR(revision, S_IRUGO, gbefb_show_rev, NULL);
10741074

1075-
static void gbefb_remove_sysfs(struct device *dev)
1076-
{
1077-
device_remove_file(dev, &dev_attr_size);
1078-
device_remove_file(dev, &dev_attr_revision);
1079-
}
1080-
1081-
static void gbefb_create_sysfs(struct device *dev)
1082-
{
1083-
device_create_file(dev, &dev_attr_size);
1084-
device_create_file(dev, &dev_attr_revision);
1085-
}
1075+
static struct attribute *gbefb_attrs[] = {
1076+
&dev_attr_size.attr,
1077+
&dev_attr_revision.attr,
1078+
NULL,
1079+
};
1080+
ATTRIBUTE_GROUPS(gbefb);
10861081

10871082
/*
10881083
* Initialization
@@ -1221,7 +1216,6 @@ static int gbefb_probe(struct platform_device *p_dev)
12211216
}
12221217

12231218
platform_set_drvdata(p_dev, info);
1224-
gbefb_create_sysfs(&p_dev->dev);
12251219

12261220
fb_info(info, "%s rev %d @ 0x%08x using %dkB memory\n",
12271221
info->fix.id, gbe_revision, (unsigned)GBE_BASE,
@@ -1248,7 +1242,6 @@ static int gbefb_remove(struct platform_device* p_dev)
12481242
gbe_turn_off();
12491243
arch_phys_wc_del(par->wc_cookie);
12501244
release_mem_region(GBE_BASE, sizeof(struct sgi_gbe));
1251-
gbefb_remove_sysfs(&p_dev->dev);
12521245
framebuffer_release(info);
12531246

12541247
return 0;
@@ -1259,6 +1252,7 @@ static struct platform_driver gbefb_driver = {
12591252
.remove = gbefb_remove,
12601253
.driver = {
12611254
.name = "gbefb",
1255+
.dev_groups = gbefb_groups,
12621256
},
12631257
};
12641258

0 commit comments

Comments
 (0)