diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-02-23 14:42:36 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-02-23 14:42:36 +0100 |
| commit | 8e12396b74c85972558388652e802a54c799363b (patch) | |
| tree | aa352cb0feaf0262c1303d0d6897aae9ba76531e | |
| parent | 04c8517ea271c76be09288ebcd7a48515f96236f (diff) | |
| download | NetworkManager-8e12396b74c85972558388652e802a54c799363b.tar.gz | |
modem: remove unused reason argument from nm_modem_device_state_changed()
The reason has pecular meanings during a device state change.
Let's remove the unused reason argument to reduce the noise.
| -rw-r--r-- | src/devices/bluetooth/nm-device-bt.c | 5 | ||||
| -rw-r--r-- | src/devices/wwan/nm-device-modem.c | 2 | ||||
| -rw-r--r-- | src/devices/wwan/nm-modem.c | 3 | ||||
| -rw-r--r-- | src/devices/wwan/nm-modem.h | 3 |
4 files changed, 5 insertions, 8 deletions
diff --git a/src/devices/bluetooth/nm-device-bt.c b/src/devices/bluetooth/nm-device-bt.c index aed3c3c330..717af06b1c 100644 --- a/src/devices/bluetooth/nm-device-bt.c +++ b/src/devices/bluetooth/nm-device-bt.c @@ -508,7 +508,7 @@ device_state_changed (NMDevice *device, NMDeviceBtPrivate *priv = NM_DEVICE_BT_GET_PRIVATE ((NMDeviceBt *) device); if (priv->modem) - nm_modem_device_state_changed (priv->modem, new_state, old_state, reason); + nm_modem_device_state_changed (priv->modem, new_state, old_state); /* Need to recheck available connections whenever MM appears or disappears, * since the device could be both DUN and NAP capable and thus may not @@ -925,8 +925,7 @@ deactivate (NMDevice *device) */ nm_modem_device_state_changed (priv->modem, NM_DEVICE_STATE_DISCONNECTED, - NM_DEVICE_STATE_ACTIVATED, - NM_DEVICE_STATE_REASON_USER_REQUESTED); + NM_DEVICE_STATE_ACTIVATED); modem_cleanup (NM_DEVICE_BT (device)); } } diff --git a/src/devices/wwan/nm-device-modem.c b/src/devices/wwan/nm-device-modem.c index 3c4ed4d9df..076eb19dd6 100644 --- a/src/devices/wwan/nm-device-modem.c +++ b/src/devices/wwan/nm-device-modem.c @@ -375,7 +375,7 @@ device_state_changed (NMDevice *device, nm_modem_state_to_string (nm_modem_get_state (priv->modem))); } - nm_modem_device_state_changed (priv->modem, new_state, old_state, reason); + nm_modem_device_state_changed (priv->modem, new_state, old_state); switch (reason) { case NM_DEVICE_STATE_REASON_GSM_REGISTRATION_DENIED: diff --git a/src/devices/wwan/nm-modem.c b/src/devices/wwan/nm-modem.c index e959cffa3d..f805bbfed3 100644 --- a/src/devices/wwan/nm-modem.c +++ b/src/devices/wwan/nm-modem.c @@ -1257,8 +1257,7 @@ nm_modem_deactivate (NMModem *self, NMDevice *device) void nm_modem_device_state_changed (NMModem *self, NMDeviceState new_state, - NMDeviceState old_state, - NMDeviceStateReason reason) + NMDeviceState old_state) { gboolean was_connected = FALSE, warn = TRUE; NMModemPrivate *priv; diff --git a/src/devices/wwan/nm-modem.h b/src/devices/wwan/nm-modem.h index df437b317f..a50727a96a 100644 --- a/src/devices/wwan/nm-modem.h +++ b/src/devices/wwan/nm-modem.h @@ -222,8 +222,7 @@ gboolean nm_modem_deactivate_async_finish (NMModem *self, void nm_modem_device_state_changed (NMModem *modem, NMDeviceState new_state, - NMDeviceState old_state, - NMDeviceStateReason reason); + NMDeviceState old_state); void nm_modem_set_mm_enabled (NMModem *self, gboolean enabled); |