]> www.infradead.org Git - users/willy/xarray.git/commit
net: convert to nla_get_*_default()
authorJohannes Berg <johannes.berg@intel.com>
Fri, 8 Nov 2024 10:41:45 +0000 (11:41 +0100)
committerJakub Kicinski <kuba@kernel.org>
Mon, 11 Nov 2024 18:32:06 +0000 (10:32 -0800)
commita885a6b2d37eaaae08323583bdb1928c8a2935fc
tree89aaf7e888f88b28f4c8acc88171c0d21eb2fb08
parent7f4b3960e54faec72132a71da4a84a8e2a0b9037
net: convert to nla_get_*_default()

Most of the original conversion is from the spatch below,
but I edited some and left out other instances that were
either buggy after conversion (where default values don't
fit into the type) or just looked strange.

    @@
    expression attr, def;
    expression val;
    identifier fn =~ "^nla_get_.*";
    fresh identifier dfn = fn ## "_default";
    @@
    (
    -if (attr)
    -  val = fn(attr);
    -else
    -  val = def;
    +val = dfn(attr, def);
    |
    -if (!attr)
    -  val = def;
    -else
    -  val = fn(attr);
    +val = dfn(attr, def);
    |
    -if (!attr)
    -  return def;
    -return fn(attr);
    +return dfn(attr, def);
    |
    -attr ? fn(attr) : def
    +dfn(attr, def)
    |
    -!attr ? def : fn(attr)
    +dfn(attr, def)
    )

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Reviewed-by: Toke Høiland-Jørgensen <toke@kernel.org>
Link: https://patch.msgid.link/20241108114145.0580b8684e7f.I740beeaa2f70ebfc19bfca1045a24d6151992790@changeid
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
40 files changed:
drivers/net/amt.c
drivers/net/gtp.c
drivers/net/macsec.c
drivers/net/vxlan/vxlan_core.c
net/8021q/vlan_netlink.c
net/core/fib_rules.c
net/core/rtnetlink.c
net/devlink/dev.c
net/hsr/hsr_netlink.c
net/ieee802154/nl-mac.c
net/ieee802154/nl802154.c
net/ipv4/devinet.c
net/ipv4/ipmr.c
net/ipv4/nexthop.c
net/ipv4/route.c
net/ipv6/addrconf.c
net/ipv6/ila/ila_xlat.c
net/ipv6/ioam6.c
net/ipv6/ioam6_iptunnel.c
net/ipv6/ip6mr.c
net/netfilter/ipvs/ip_vs_ctl.c
net/netfilter/nf_nat_core.c
net/netfilter/nft_tunnel.c
net/netlabel/netlabel_mgmt.c
net/openvswitch/datapath.c
net/openvswitch/flow_netlink.c
net/sched/act_ct.c
net/sched/act_ctinfo.c
net/sched/act_gate.c
net/sched/act_mpls.c
net/sched/act_police.c
net/sched/cls_api.c
net/sched/sch_choke.c
net/sched/sch_gred.c
net/sched/sch_htb.c
net/sched/sch_qfq.c
net/sched/sch_red.c
net/sched/sch_taprio.c
net/wireless/nl80211.c
net/xfrm/xfrm_user.c