diff options
| author | Benjamin Berg <bberg@redhat.com> | 2017-08-31 17:34:08 +0200 |
|---|---|---|
| committer | Benjamin Berg <bberg@redhat.com> | 2017-08-31 17:38:32 +0200 |
| commit | 8e707663135d28176163c9363c558ecac17c9ddb (patch) | |
| tree | aece3821da868b511ea10eea36115589de060717 /src/rfkill | |
| parent | 6c1f72f626355615daee0e5a7ef7044759251a23 (diff) | |
| download | systemd-8e707663135d28176163c9363c558ecac17c9ddb.tar.gz | |
rfkill: Lookup device in determine_state_file
None of the callers actually need the device itself. So it makes sense
to do the lookup inside determine_state_file instead.
Diffstat (limited to 'src/rfkill')
| -rw-r--r-- | src/rfkill/rfkill.c | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/src/rfkill/rfkill.c b/src/rfkill/rfkill.c index e48f3e4513..0c617e38c9 100644 --- a/src/rfkill/rfkill.c +++ b/src/rfkill/rfkill.c @@ -162,18 +162,21 @@ static int wait_for_initialized( static int determine_state_file( struct udev *udev, const struct rfkill_event *event, - struct udev_device *d, char **ret) { + _cleanup_udev_device_unref_ struct udev_device *d = NULL; _cleanup_udev_device_unref_ struct udev_device *device = NULL; const char *path_id, *type; char *state_file; int r; assert(event); - assert(d); assert(ret); + r = find_device(udev, event, &d); + if (r < 0) + return r; + r = wait_for_initialized(udev, d, &device); if (r < 0) return r; @@ -204,7 +207,6 @@ static int load_state( struct udev *udev, const struct rfkill_event *event) { - _cleanup_udev_device_unref_ struct udev_device *device = NULL; _cleanup_free_ char *state_file = NULL, *value = NULL; struct rfkill_event we; ssize_t l; @@ -217,11 +219,7 @@ static int load_state( if (shall_restore_state() == 0) return 0; - r = find_device(udev, event, &device); - if (r < 0) - return r; - - r = determine_state_file(udev, event, device, &state_file); + r = determine_state_file(udev, event, &state_file); if (r < 0) return r; @@ -266,7 +264,6 @@ static int save_state( struct udev *udev, const struct rfkill_event *event) { - _cleanup_udev_device_unref_ struct udev_device *device = NULL; _cleanup_free_ char *state_file = NULL; int r; @@ -274,11 +271,7 @@ static int save_state( assert(udev); assert(event); - r = find_device(udev, event, &device); - if (r < 0) - return r; - - r = determine_state_file(udev, event, device, &state_file); + r = determine_state_file(udev, event, &state_file); if (r < 0) return r; |