nfc: hci: Introduce nfc_llc_del_engine() to reduce code duplication

Add a new helper to avoid code duplication between nfc_llc_exit() and
nfc_llc_unregister().

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/net/nfc/hci/llc.c b/net/nfc/hci/llc.c
index 2140f67246441622bd616c5b6d3d1cc434853241..480c17f372a535ce6800cf583c62e702e2dc59b8 100644 (file)
--- a/net/nfc/hci/llc.c
+++ b/net/nfc/hci/llc.c
@@ -30,15 +30,19 @@ exit:
        return r;
 }
 
+static void nfc_llc_del_engine(struct nfc_llc_engine *llc_engine)
+{
+       list_del(&llc_engine->entry);
+       kfree(llc_engine->name);
+       kfree(llc_engine);
+}
+
 void nfc_llc_exit(void)
 {
        struct nfc_llc_engine *llc_engine, *n;
 
-       list_for_each_entry_safe(llc_engine, n, &llc_engines, entry) {
-               list_del(&llc_engine->entry);
-               kfree(llc_engine->name);
-               kfree(llc_engine);
-       }
+       list_for_each_entry_safe(llc_engine, n, &llc_engines, entry)
+               nfc_llc_del_engine(llc_engine);
 }
 
 int nfc_llc_register(const char *name, const struct nfc_llc_ops *ops)
@@ -82,9 +86,7 @@ void nfc_llc_unregister(const char *name)
        if (llc_engine == NULL)
                return;
 
-       list_del(&llc_engine->entry);
-       kfree(llc_engine->name);
-       kfree(llc_engine);
+       nfc_llc_del_engine(llc_engine);
 }
 
 struct nfc_llc *nfc_llc_allocate(const char *name, struct nfc_hci_dev *hdev,