chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
treewide: yet more log_*_errno + return simplifications
[elogind.git]
/
src
/
udev
/
net
/
ethtool-util.c
diff --git
a/src/udev/net/ethtool-util.c
b/src/udev/net/ethtool-util.c
index 4608a6c982beadb51fc8cc8b3cfca071830e4220..ec67126b21b1995ce01bddb453260afe9b076a30 100644
(file)
--- a/
src/udev/net/ethtool-util.c
+++ b/
src/udev/net/ethtool-util.c
@@
-75,10
+75,8
@@
int ethtool_get_driver(int *fd, const char *ifname, char **ret) {
if (*fd < 0) {
r = ethtool_connect(fd);
if (*fd < 0) {
r = ethtool_connect(fd);
- if (r < 0) {
- log_warning_errno(r, "link_config: could not connect to ethtool: %m");
- return r;
- }
+ if (r < 0)
+ return log_warning_errno(r, "link_config: could not connect to ethtool: %m");
}
strscpy(ifr.ifr_name, IFNAMSIZ, ifname);
}
strscpy(ifr.ifr_name, IFNAMSIZ, ifname);
@@
-111,10
+109,8
@@
int ethtool_set_speed(int *fd, const char *ifname, unsigned int speed, Duplex du
if (*fd < 0) {
r = ethtool_connect(fd);
if (*fd < 0) {
r = ethtool_connect(fd);
- if (r < 0) {
- log_warning_errno(r, "link_config: could not connect to ethtool: %m");
- return r;
- }
+ if (r < 0)
+ return log_warning_errno(r, "link_config: could not connect to ethtool: %m");
}
strscpy(ifr.ifr_name, IFNAMSIZ, ifname);
}
strscpy(ifr.ifr_name, IFNAMSIZ, ifname);
@@
-171,10
+167,8
@@
int ethtool_set_wol(int *fd, const char *ifname, WakeOnLan wol) {
if (*fd < 0) {
r = ethtool_connect(fd);
if (*fd < 0) {
r = ethtool_connect(fd);
- if (r < 0) {
- log_warning_errno(r, "link_config: could not connect to ethtool: %m");
- return r;
- }
+ if (r < 0)
+ return log_warning_errno(r, "link_config: could not connect to ethtool: %m");
}
strscpy(ifr.ifr_name, IFNAMSIZ, ifname);
}
strscpy(ifr.ifr_name, IFNAMSIZ, ifname);