Commit 672beab0 authored by Eric Dumazet's avatar Eric Dumazet Committed by Jakub Kicinski
Browse files

psp: rename our psp_dev_destroy() 

psp_dev_destroy() was already used in drivers/crypto/ccp/psp-dev.c

Use psp_dev_free() instead, to avoid a link error when
CRYPTO_DEV_SP_CCP=y

Fixes: 00c94ca2 ("psp: base PSP device support")
Closes: https://lore.kernel.org/netdev/CANn89i+ZdBDEV6TE=Nw5gn9ycTzWw4mZOpPuCswgwEsrgOyNnw@mail.gmail.com/


Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Cc: Willem de Bruijn <willemb@google.com>
Acked-by: default avatarPaolo Abeni <pabeni@redhat.com>
Reviewed-by: default avatarDaniel Zahka <daniel.zahka@gmail.com>
Link: https://patch.msgid.link/20250918113546.177946-1-edumazet@google.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 7b712146

net/psp/psp.h

+2 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
extern struct xarray psp_devs;

extern struct mutex psp_devs_lock;



void psp_dev_destroy(struct psp_dev *psd);

void psp_dev_free(struct psp_dev *psd);

int psp_dev_check_access(struct psp_dev *psd, struct net *net);



void psp_nl_notify_dev(struct psp_dev *psd, u32 cmd);
@@ -42,7 +42,7 @@ static inline bool psp_dev_tryget(struct psp_dev *psd) 
static inline void psp_dev_put(struct psp_dev *psd)

{

	if (refcount_dec_and_test(&psd->refcnt))

		psp_dev_destroy(psd);

		psp_dev_free(psd);

}



static inline bool psp_dev_is_registered(struct psp_dev *psd)

net/psp/psp_main.c

+2 −2
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ psp_dev_create(struct net_device *netdev, 
}

EXPORT_SYMBOL(psp_dev_create);



void psp_dev_destroy(struct psp_dev *psd)

void psp_dev_free(struct psp_dev *psd)

{

	mutex_lock(&psp_devs_lock);

	xa_erase(&psp_devs, psd->id);
@@ -122,7 +122,7 @@ void psp_dev_unregister(struct psp_dev *psd) 


	psp_nl_notify_dev(psd, PSP_CMD_DEV_DEL_NTF);



	/* Wait until psp_dev_destroy() to call xa_erase() to prevent a

	/* Wait until psp_dev_free() to call xa_erase() to prevent a

	 * different psd from being added to the xarray with this id, while

	 * there are still references to this psd being held.

	 */