lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

m68k: zorro - Kill warn_unused_result warnings

Browse Source 
warning: ignoring return value of 'device_register', declared with attribute
warn_unused_result
warning: ignoring return value of 'device_create_file', declared with
attribute warn_unused_result

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
This commit is contained in:
Geert Uytterhoeven
2008-12-30 14:21:19 +01:00
parent 2e4c77bea3
commit 11a8b2c5cd
3 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/zorro/zorro-sysfs.c
View File

@@ -77,17 +77,21 @@ static struct bin_attribute zorro_config_attr = {
.read = zorro_read_config, .read = zorro_read_config,
}; };
void zorro_create_sysfs_dev_files(struct zorro_dev *z) int zorro_create_sysfs_dev_files(struct zorro_dev *z)
{ {
struct device *dev = &z->dev; struct device *dev = &z->dev;
int error;
/* current configuration's attributes */ /* current configuration's attributes */
device_create_file(dev, &dev_attr_id); if ((error = device_create_file(dev, &dev_attr_id)) ||
device_create_file(dev, &dev_attr_type); (error = device_create_file(dev, &dev_attr_type)) ||
device_create_file(dev, &dev_attr_serial); (error = device_create_file(dev, &dev_attr_serial)) ||
device_create_file(dev, &dev_attr_slotaddr); (error = device_create_file(dev, &dev_attr_slotaddr)) ||
device_create_file(dev, &dev_attr_slotsize); (error = device_create_file(dev, &dev_attr_slotsize)) ||
device_create_file(dev, &dev_attr_resource); (error = device_create_file(dev, &dev_attr_resource)) ||
sysfs_create_bin_file(&dev->kobj, &zorro_config_attr); (error = sysfs_create_bin_file(&dev->kobj, &zorro_config_attr)))
return error;
return 0;
} }

17
drivers/zorro/zorro.c
View File

@@ -130,6 +130,7 @@ static int __init zorro_init(void)
{ {
struct zorro_dev *z; struct zorro_dev *z;
unsigned int i; unsigned int i;
int error;
if (!MACH_IS_AMIGA || !AMIGAHW_PRESENT(ZORRO)) if (!MACH_IS_AMIGA || !AMIGAHW_PRESENT(ZORRO))
return 0; return 0;
@@ -140,7 +141,11 @@ static int __init zorro_init(void)
/* Initialize the Zorro bus */ /* Initialize the Zorro bus */
INIT_LIST_HEAD(&zorro_bus.devices); INIT_LIST_HEAD(&zorro_bus.devices);
strcpy(zorro_bus.dev.bus_id, "zorro"); strcpy(zorro_bus.dev.bus_id, "zorro");
device_register(&zorro_bus.dev); error = device_register(&zorro_bus.dev);
if (error) {
pr_err("Zorro: Error registering zorro_bus\n");
return error;
}
/* Request the resources */ /* Request the resources */
zorro_bus.num_resources = AMIGAHW_PRESENT(ZORRO3) ? 4 : 2; zorro_bus.num_resources = AMIGAHW_PRESENT(ZORRO3) ? 4 : 2;
@@ -167,8 +172,14 @@ static int __init zorro_init(void)
sprintf(z->dev.bus_id, "%02x", i); sprintf(z->dev.bus_id, "%02x", i);
z->dev.parent = &zorro_bus.dev; z->dev.parent = &zorro_bus.dev;
z->dev.bus = &zorro_bus_type; z->dev.bus = &zorro_bus_type;
device_register(&z->dev); error = device_register(&z->dev);
zorro_create_sysfs_dev_files(z); if (error) {
pr_err("Zorro: Error registering device %s\n", z->name);
continue;
}
error = zorro_create_sysfs_dev_files(z);
if (error)
dev_err(&z->dev, "Error creating sysfs files\n");
} }
/* Mark all available Zorro II memory */ /* Mark all available Zorro II memory */

2
drivers/zorro/zorro.h
View File

@@ -1,4 +1,4 @@
extern void zorro_name_device(struct zorro_dev *z); extern void zorro_name_device(struct zorro_dev *z);
extern void zorro_create_sysfs_dev_files(struct zorro_dev *z); extern int zorro_create_sysfs_dev_files(struct zorro_dev *z);