diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2014-03-11 11:38:09 +0100 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2014-03-12 08:50:05 +0100 |
| commit | 40e3c79a591909ab64822cc86fd07513317bf19b (patch) | |
| tree | 25353ac2e68439f32fc5094de3272a95b483d4c0 /config | |
| parent | 92ff79f1a804d63d2f2bb59dfbf3a2869627609a (diff) | |
Remove config_odev_add_*attribute checks in various places
Note that there are more callers but those were already not doing any
error checking.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'config')
| -rw-r--r-- | config/udev.c | 32 |
1 files changed, 6 insertions, 26 deletions
diff --git a/config/udev.c b/config/udev.c index d88abaaa1..a1b72c13b 100644 --- a/config/udev.c +++ b/config/udev.c @@ -55,7 +55,7 @@ static struct udev_monitor *udev_monitor; #ifdef CONFIG_UDEV_KMS -static Bool +static void config_udev_odev_setup_attribs(const char *path, const char *syspath, int major, int minor, config_odev_probe_proc_ptr probe_callback); @@ -457,40 +457,20 @@ config_udev_fini(void) #ifdef CONFIG_UDEV_KMS -static Bool +static void config_udev_odev_setup_attribs(const char *path, const char *syspath, int major, int minor, config_odev_probe_proc_ptr probe_callback) { struct OdevAttributes *attribs = config_odev_allocate_attribute_list(); - int ret; - - if (!attribs) - return FALSE; - - ret = config_odev_add_attribute(attribs, ODEV_ATTRIB_PATH, path); - if (ret == FALSE) - goto fail; - - ret = config_odev_add_attribute(attribs, ODEV_ATTRIB_SYSPATH, syspath); - if (ret == FALSE) - goto fail; - - ret = config_odev_add_int_attribute(attribs, ODEV_ATTRIB_MAJOR, major); - if (ret == FALSE) - goto fail; - ret = config_odev_add_int_attribute(attribs, ODEV_ATTRIB_MINOR, minor); - if (ret == FALSE) - goto fail; + config_odev_add_attribute(attribs, ODEV_ATTRIB_PATH, path); + config_odev_add_attribute(attribs, ODEV_ATTRIB_SYSPATH, syspath); + config_odev_add_int_attribute(attribs, ODEV_ATTRIB_MAJOR, major); + config_odev_add_int_attribute(attribs, ODEV_ATTRIB_MINOR, minor); /* ownership of attribs is passed to probe layer */ probe_callback(attribs); - return TRUE; -fail: - config_odev_free_attributes(attribs); - free(attribs); - return FALSE; } void |