diff options
| author | Eric Dumazet <edumazet@google.com> | 2025-09-18 11:35:46 +0000 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2025-09-18 07:04:25 -0700 |
| commit | 672beab06656f2f1bda4708cda2b9af61c58a7ea (patch) | |
| tree | 88ca58573bef49811fb81803d4b144adc2793a15 | |
| parent | 7b712146cb8c2b9b741a7eea028c24adef66b1e4 (diff) | |
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: 00c94ca2b99e ("psp: base PSP device support")
Closes: https://lore.kernel.org/netdev/CANn89i+ZdBDEV6TE=Nw5gn9ycTzWw4mZOpPuCswgwEsrgOyNnw@mail.gmail.com/
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Willem de Bruijn <willemb@google.com>
Acked-by: Paolo Abeni <pabeni@redhat.com>
Reviewed-by: Daniel Zahka <daniel.zahka@gmail.com>
Link: https://patch.msgid.link/20250918113546.177946-1-edumazet@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
| -rw-r--r-- | net/psp/psp.h | 4 | ||||
| -rw-r--r-- | net/psp/psp_main.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/net/psp/psp.h b/net/psp/psp.h index 0f34e1a23fdd..9f19137593a0 100644 --- a/net/psp/psp.h +++ b/net/psp/psp.h @@ -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) diff --git a/net/psp/psp_main.c b/net/psp/psp_main.c index b4b756f87382..0f8c50c8e943 100644 --- a/net/psp/psp_main.c +++ b/net/psp/psp_main.c @@ -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. */ |