devlink: Use switch-case instead of if-else

Make core more readable with switch-case for various port flavours.

Acked-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Parav Pandit <parav@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/core/devlink.c b/net/core/devlink.c
index b709132..6e52d63 100644 (file)
--- a/net/core/devlink.c
+++ b/net/core/devlink.c
@@ -510,32 +510,37 @@ static int devlink_nl_port_attrs_put(struct sk_buff *msg,
                return 0;
        if (nla_put_u16(msg, DEVLINK_ATTR_PORT_FLAVOUR, attrs->flavour))
                return -EMSGSIZE;
-       if (devlink_port->attrs.flavour == DEVLINK_PORT_FLAVOUR_PCI_PF) {
+       switch (devlink_port->attrs.flavour) {
+       case DEVLINK_PORT_FLAVOUR_PCI_PF:
                if (nla_put_u16(msg, DEVLINK_ATTR_PORT_PCI_PF_NUMBER,
                                attrs->pci_pf.pf))
                        return -EMSGSIZE;
-       } else if (devlink_port->attrs.flavour == DEVLINK_PORT_FLAVOUR_PCI_VF) {
+               break;
+       case DEVLINK_PORT_FLAVOUR_PCI_VF:
                if (nla_put_u16(msg, DEVLINK_ATTR_PORT_PCI_PF_NUMBER,
                                attrs->pci_vf.pf) ||
                    nla_put_u16(msg, DEVLINK_ATTR_PORT_PCI_VF_NUMBER,
                                attrs->pci_vf.vf))
                        return -EMSGSIZE;
+               break;
+       case DEVLINK_PORT_FLAVOUR_PHYSICAL:
+       case DEVLINK_PORT_FLAVOUR_CPU:
+       case DEVLINK_PORT_FLAVOUR_DSA:
+               if (nla_put_u32(msg, DEVLINK_ATTR_PORT_NUMBER,
+                               attrs->phys.port_number))
+                       return -EMSGSIZE;
+               if (!attrs->split)
+                       return 0;
+               if (nla_put_u32(msg, DEVLINK_ATTR_PORT_SPLIT_GROUP,
+                               attrs->phys.port_number))
+                       return -EMSGSIZE;
+               if (nla_put_u32(msg, DEVLINK_ATTR_PORT_SPLIT_SUBPORT_NUMBER,
+                               attrs->phys.split_subport_number))
+                       return -EMSGSIZE;
+               break;
+       default:
+               break;
        }
-       if (devlink_port->attrs.flavour != DEVLINK_PORT_FLAVOUR_PHYSICAL &&
-           devlink_port->attrs.flavour != DEVLINK_PORT_FLAVOUR_CPU &&
-           devlink_port->attrs.flavour != DEVLINK_PORT_FLAVOUR_DSA)
-               return 0;
-       if (nla_put_u32(msg, DEVLINK_ATTR_PORT_NUMBER,
-                       attrs->phys.port_number))
-               return -EMSGSIZE;
-       if (!attrs->split)
-               return 0;
-       if (nla_put_u32(msg, DEVLINK_ATTR_PORT_SPLIT_GROUP,
-                       attrs->phys.port_number))
-               return -EMSGSIZE;
-       if (nla_put_u32(msg, DEVLINK_ATTR_PORT_SPLIT_SUBPORT_NUMBER,
-                       attrs->phys.split_subport_number))
-               return -EMSGSIZE;
        return 0;
 }