devlink/port: Simplify return checks

Drop always returning 0 from the helper routine and simplify
its callers.

Reviewed-by: Jiri Pirko <jiri@nvidia.com>
Signed-off-by: Parav Pandit <parav@nvidia.com>
Link: https://patch.msgid.link/20250813094417.7269-2-parav@nvidia.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/devlink/port.c b/net/devlink/port.c
index cb8d4df616199ef69e091e0f6151702b4bbfafcd..aaca1b23aa5ffda19b0faf93df1629587ee4cebe 100644 (file)
--- a/net/devlink/port.c
+++ b/net/devlink/port.c
@@ -1333,8 +1333,8 @@ int devlink_port_netdevice_event(struct notifier_block *nb,
        return NOTIFY_OK;
 }
 
-static int __devlink_port_attrs_set(struct devlink_port *devlink_port,
-                                   enum devlink_port_flavour flavour)
+static void __devlink_port_attrs_set(struct devlink_port *devlink_port,
+                                    enum devlink_port_flavour flavour)
 {
        struct devlink_port_attrs *attrs = &devlink_port->attrs;
 
@@ -1347,7 +1347,6 @@ static int __devlink_port_attrs_set(struct devlink_port *devlink_port,
        } else {
                devlink_port->switch_port = false;
        }
-       return 0;
 }
 
 /**
@@ -1359,14 +1358,10 @@ static int __devlink_port_attrs_set(struct devlink_port *devlink_port,
 void devlink_port_attrs_set(struct devlink_port *devlink_port,
                            struct devlink_port_attrs *attrs)
 {
-       int ret;
-
        ASSERT_DEVLINK_PORT_NOT_REGISTERED(devlink_port);
 
        devlink_port->attrs = *attrs;
-       ret = __devlink_port_attrs_set(devlink_port, attrs->flavour);
-       if (ret)
-               return;
+       __devlink_port_attrs_set(devlink_port, attrs->flavour);
        WARN_ON(attrs->splittable && attrs->split);
 }
 EXPORT_SYMBOL_GPL(devlink_port_attrs_set);
@@ -1383,14 +1378,10 @@ void devlink_port_attrs_pci_pf_set(struct devlink_port *devlink_port, u32 contro
                                   u16 pf, bool external)
 {
        struct devlink_port_attrs *attrs = &devlink_port->attrs;
-       int ret;
 
        ASSERT_DEVLINK_PORT_NOT_REGISTERED(devlink_port);
 
-       ret = __devlink_port_attrs_set(devlink_port,
-                                      DEVLINK_PORT_FLAVOUR_PCI_PF);
-       if (ret)
-               return;
+       __devlink_port_attrs_set(devlink_port, DEVLINK_PORT_FLAVOUR_PCI_PF);
        attrs->pci_pf.controller = controller;
        attrs->pci_pf.pf = pf;
        attrs->pci_pf.external = external;
@@ -1411,14 +1402,10 @@ void devlink_port_attrs_pci_vf_set(struct devlink_port *devlink_port, u32 contro
                                   u16 pf, u16 vf, bool external)
 {
        struct devlink_port_attrs *attrs = &devlink_port->attrs;
-       int ret;
 
        ASSERT_DEVLINK_PORT_NOT_REGISTERED(devlink_port);
 
-       ret = __devlink_port_attrs_set(devlink_port,
-                                      DEVLINK_PORT_FLAVOUR_PCI_VF);
-       if (ret)
-               return;
+       __devlink_port_attrs_set(devlink_port, DEVLINK_PORT_FLAVOUR_PCI_VF);
        attrs->pci_vf.controller = controller;
        attrs->pci_vf.pf = pf;
        attrs->pci_vf.vf = vf;
@@ -1439,14 +1426,10 @@ void devlink_port_attrs_pci_sf_set(struct devlink_port *devlink_port, u32 contro
                                   u16 pf, u32 sf, bool external)
 {
        struct devlink_port_attrs *attrs = &devlink_port->attrs;
-       int ret;
 
        ASSERT_DEVLINK_PORT_NOT_REGISTERED(devlink_port);
 
-       ret = __devlink_port_attrs_set(devlink_port,
-                                      DEVLINK_PORT_FLAVOUR_PCI_SF);
-       if (ret)
-               return;
+       __devlink_port_attrs_set(devlink_port, DEVLINK_PORT_FLAVOUR_PCI_SF);
        attrs->pci_sf.controller = controller;
        attrs->pci_sf.pf = pf;
        attrs->pci_sf.sf = sf;