tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'devlink-port-attr-cleanup'

Parav Pandit says:

====================
devlink port attr cleanup

patch-1 removes the return 0 check at several places and simplfies
patch-2 constifies the attributes and moves the checks early
caller
====================

Link: https://patch.msgid.link/20250813094417.7269-1-parav@nvidia.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

Jakub Kicinski 9b96c60d c6f68f69

+9 -26
+1 -1
include/net/devlink.h
··· 1743 1743 struct ib_device *ibdev); 1744 1744 void devlink_port_type_clear(struct devlink_port *devlink_port); 1745 1745 void devlink_port_attrs_set(struct devlink_port *devlink_port, 1746 - struct devlink_port_attrs *devlink_port_attrs); 1746 + const struct devlink_port_attrs *attrs); 1747 1747 void devlink_port_attrs_pci_pf_set(struct devlink_port *devlink_port, u32 controller, 1748 1748 u16 pf, bool external); 1749 1749 void devlink_port_attrs_pci_vf_set(struct devlink_port *devlink_port, u32 controller,
+8 -25
net/devlink/port.c
··· 1333 1333 return NOTIFY_OK; 1334 1334 } 1335 1335 1336 - static int __devlink_port_attrs_set(struct devlink_port *devlink_port, 1337 - enum devlink_port_flavour flavour) 1336 + static void __devlink_port_attrs_set(struct devlink_port *devlink_port, 1337 + enum devlink_port_flavour flavour) 1338 1338 { 1339 1339 struct devlink_port_attrs *attrs = &devlink_port->attrs; 1340 1340 ··· 1347 1347 } else { 1348 1348 devlink_port->switch_port = false; 1349 1349 } 1350 - return 0; 1351 1350 } 1352 1351 1353 1352 /** ··· 1356 1357 * @attrs: devlink port attrs 1357 1358 */ 1358 1359 void devlink_port_attrs_set(struct devlink_port *devlink_port, 1359 - struct devlink_port_attrs *attrs) 1360 + const struct devlink_port_attrs *attrs) 1360 1361 { 1361 - int ret; 1362 - 1363 1362 ASSERT_DEVLINK_PORT_NOT_REGISTERED(devlink_port); 1363 + WARN_ON(attrs->splittable && attrs->split); 1364 1364 1365 1365 devlink_port->attrs = *attrs; 1366 - ret = __devlink_port_attrs_set(devlink_port, attrs->flavour); 1367 - if (ret) 1368 - return; 1369 - WARN_ON(attrs->splittable && attrs->split); 1366 + __devlink_port_attrs_set(devlink_port, attrs->flavour); 1370 1367 } 1371 1368 EXPORT_SYMBOL_GPL(devlink_port_attrs_set); 1372 1369 ··· 1378 1383 u16 pf, bool external) 1379 1384 { 1380 1385 struct devlink_port_attrs *attrs = &devlink_port->attrs; 1381 - int ret; 1382 1386 1383 1387 ASSERT_DEVLINK_PORT_NOT_REGISTERED(devlink_port); 1384 1388 1385 - ret = __devlink_port_attrs_set(devlink_port, 1386 - DEVLINK_PORT_FLAVOUR_PCI_PF); 1387 - if (ret) 1388 - return; 1389 + __devlink_port_attrs_set(devlink_port, DEVLINK_PORT_FLAVOUR_PCI_PF); 1389 1390 attrs->pci_pf.controller = controller; 1390 1391 attrs->pci_pf.pf = pf; 1391 1392 attrs->pci_pf.external = external; ··· 1402 1411 u16 pf, u16 vf, bool external) 1403 1412 { 1404 1413 struct devlink_port_attrs *attrs = &devlink_port->attrs; 1405 - int ret; 1406 1414 1407 1415 ASSERT_DEVLINK_PORT_NOT_REGISTERED(devlink_port); 1408 1416 1409 - ret = __devlink_port_attrs_set(devlink_port, 1410 - DEVLINK_PORT_FLAVOUR_PCI_VF); 1411 - if (ret) 1412 - return; 1417 + __devlink_port_attrs_set(devlink_port, DEVLINK_PORT_FLAVOUR_PCI_VF); 1413 1418 attrs->pci_vf.controller = controller; 1414 1419 attrs->pci_vf.pf = pf; 1415 1420 attrs->pci_vf.vf = vf; ··· 1426 1439 u16 pf, u32 sf, bool external) 1427 1440 { 1428 1441 struct devlink_port_attrs *attrs = &devlink_port->attrs; 1429 - int ret; 1430 1442 1431 1443 ASSERT_DEVLINK_PORT_NOT_REGISTERED(devlink_port); 1432 1444 1433 - ret = __devlink_port_attrs_set(devlink_port, 1434 - DEVLINK_PORT_FLAVOUR_PCI_SF); 1435 - if (ret) 1436 - return; 1445 + __devlink_port_attrs_set(devlink_port, DEVLINK_PORT_FLAVOUR_PCI_SF); 1437 1446 attrs->pci_sf.controller = controller; 1438 1447 attrs->pci_sf.pf = pf; 1439 1448 attrs->pci_sf.sf = sf;