提交 2e4c77be 编写于 作者: G Geert Uytterhoeven

m68k: dio - Kill warn_unused_result warnings

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: NGeert Uytterhoeven <geert@linux-m68k.org>
上级 639274d8
......@@ -63,15 +63,19 @@ static ssize_t dio_show_resource(struct device *dev, struct device_attribute *at
}
static DEVICE_ATTR(resource, S_IRUGO, dio_show_resource, NULL);
void dio_create_sysfs_dev_files(struct dio_dev *d)
int dio_create_sysfs_dev_files(struct dio_dev *d)
{
struct device *dev = &d->dev;
int error;
/* current configuration's attributes */
device_create_file(dev, &dev_attr_id);
device_create_file(dev, &dev_attr_ipl);
device_create_file(dev, &dev_attr_secid);
device_create_file(dev, &dev_attr_name);
device_create_file(dev, &dev_attr_resource);
if ((error = device_create_file(dev, &dev_attr_id)) ||
(error = device_create_file(dev, &dev_attr_ipl)) ||
(error = device_create_file(dev, &dev_attr_secid)) ||
(error = device_create_file(dev, &dev_attr_name)) ||
(error = device_create_file(dev, &dev_attr_resource)))
return error;
return 0;
}
......@@ -173,6 +173,7 @@ static int __init dio_init(void)
mm_segment_t fs;
int i;
struct dio_dev *dev;
int error;
if (!MACH_IS_HP300)
return 0;
......@@ -182,7 +183,11 @@ static int __init dio_init(void)
/* Initialize the DIO bus */
INIT_LIST_HEAD(&dio_bus.devices);
strcpy(dio_bus.dev.bus_id, "dio");
device_register(&dio_bus.dev);
error = device_register(&dio_bus.dev);
if (error) {
pr_err("DIO: Error registering dio_bus\n");
return error;
}
/* Request all resources */
dio_bus.num_resources = (hp300_model == HP_320 ? 1 : 2);
......@@ -252,8 +257,15 @@ static int __init dio_init(void)
if (scode >= DIOII_SCBASE)
iounmap(va);
device_register(&dev->dev);
dio_create_sysfs_dev_files(dev);
error = device_register(&dev->dev);
if (error) {
pr_err("DIO: Error registering device %s\n",
dev->name);
continue;
}
error = dio_create_sysfs_dev_files(dev);
if (error)
dev_err(&dev->dev, "Error creating sysfs files\n");
}
return 0;
}
......
......@@ -241,7 +241,7 @@ struct dio_driver {
extern int dio_find(int deviceid);
extern unsigned long dio_scodetophysaddr(int scode);
extern void dio_create_sysfs_dev_files(struct dio_dev *);
extern int dio_create_sysfs_dev_files(struct dio_dev *);
/* New-style probing */
extern int dio_register_driver(struct dio_driver *);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册