From 5d336aa1ede16921243868449dd15730f8870c35 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 22 Feb 2017 21:46:11 +0100 Subject: [PATCH] device: rename reason argument for NMDeviceDummy And remove assertion for out-argument to be present. Follow-up to commit 437c12fc89e6da99ca3820ed23b6276d587ee2d4. --- src/devices/nm-device-dummy.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/devices/nm-device-dummy.c b/src/devices/nm-device-dummy.c index c05cc5681a..10975d262d 100644 --- a/src/devices/nm-device-dummy.c +++ b/src/devices/nm-device-dummy.c @@ -135,13 +135,11 @@ check_connection_compatible (NMDevice *device, NMConnection *connection) } static NMActStageReturn -act_stage1_prepare (NMDevice *device, NMDeviceStateReason *reason) +act_stage1_prepare (NMDevice *device, NMDeviceStateReason *out_failure_reason) { NMActStageReturn ret; - g_return_val_if_fail (reason != NULL, NM_ACT_STAGE_RETURN_FAILURE); - - ret = NM_DEVICE_CLASS (nm_device_dummy_parent_class)->act_stage1_prepare (device, reason); + ret = NM_DEVICE_CLASS (nm_device_dummy_parent_class)->act_stage1_prepare (device, out_failure_reason); if (ret != NM_ACT_STAGE_RETURN_SUCCESS) return ret;