Commit 00cf1fb3 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'devlink-cosmetic-fixes' 



Jiri Pirko says:

====================
net: devlink: devl_* cosmetic fixes

Hi. This patches just fixes some small cosmetic issues of devl_* related
functions which I found on the way.
===================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 3e35d198 277cbb6b

include/net/devlink.h

+7 −9
Original line number Diff line number Diff line
@@ -1521,15 +1521,6 @@ void devl_unlock(struct devlink *devlink); 
void devl_assert_locked(struct devlink *devlink);

bool devl_lock_is_held(struct devlink *devlink);



int devl_port_register(struct devlink *devlink,

		       struct devlink_port *devlink_port,

		       unsigned int port_index);

void devl_port_unregister(struct devlink_port *devlink_port);



int devl_rate_leaf_create(struct devlink_port *port, void *priv);

void devl_rate_leaf_destroy(struct devlink_port *devlink_port);

void devl_rate_nodes_destroy(struct devlink *devlink);



struct ib_device;



struct net *devlink_net(const struct devlink *devlink);
@@ -1551,9 +1542,13 @@ void devlink_set_features(struct devlink *devlink, u64 features); 
void devlink_register(struct devlink *devlink);

void devlink_unregister(struct devlink *devlink);

void devlink_free(struct devlink *devlink);

int devl_port_register(struct devlink *devlink,

		       struct devlink_port *devlink_port,

		       unsigned int port_index);

int devlink_port_register(struct devlink *devlink,

			  struct devlink_port *devlink_port,

			  unsigned int port_index);

void devl_port_unregister(struct devlink_port *devlink_port);

void devlink_port_unregister(struct devlink_port *devlink_port);

void devlink_port_type_eth_set(struct devlink_port *devlink_port,

			       struct net_device *netdev);
@@ -1569,6 +1564,9 @@ void devlink_port_attrs_pci_vf_set(struct devlink_port *devlink_port, u32 contro 
void devlink_port_attrs_pci_sf_set(struct devlink_port *devlink_port,

				   u32 controller, u16 pf, u32 sf,

				   bool external);

int devl_rate_leaf_create(struct devlink_port *port, void *priv);

void devl_rate_leaf_destroy(struct devlink_port *devlink_port);

void devl_rate_nodes_destroy(struct devlink *devlink);

void devlink_port_linecard_set(struct devlink_port *devlink_port,

			       struct devlink_linecard *linecard);

struct devlink_linecard *

net/core/devlink.c

+137 −115

File changed.

Preview size limit exceeded, changes collapsed.