From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ben Whitten Subject: [PATCH lora-next 02/10] net: lora: add methods for devm registration Date: Tue, 7 Aug 2018 18:32:03 +0100 Message-ID: <1533663131-16313-4-git-send-email-ben.whitten@gmail.com> References: <1533663131-16313-1-git-send-email-ben.whitten@gmail.com> Cc: netdev@vger.kernel.org, Ben Whitten To: afaerber@suse.de, starnight@g.ncu.edu.tw, hasnain.virk@arm.com Return-path: Received: from mail-wr1-f66.google.com ([209.85.221.66]:38751 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727194AbeHGTrw (ORCPT ); Tue, 7 Aug 2018 15:47:52 -0400 Received: by mail-wr1-f66.google.com with SMTP id v14-v6so16533986wro.5 for ; Tue, 07 Aug 2018 10:32:29 -0700 (PDT) In-Reply-To: <1533663131-16313-1-git-send-email-ben.whitten@gmail.com> Sender: netdev-owner@vger.kernel.org List-ID: From: Ben Whitten Follow the devm model so that we can avoid lengthy unwind code. Signed-off-by: Ben Whitten --- drivers/net/lora/dev.c | 20 ++++++++++++++++++++ include/linux/lora/dev.h | 1 + 2 files changed, 21 insertions(+) diff --git a/drivers/net/lora/dev.c b/drivers/net/lora/dev.c index 8c01106..69a8b52 100644 --- a/drivers/net/lora/dev.c +++ b/drivers/net/lora/dev.c @@ -84,6 +84,26 @@ void free_loradev(struct net_device *dev) } EXPORT_SYMBOL_GPL(free_loradev); +static void devm_lora_unregister(struct device *dev, void *res) +{ + free_loradev(*(struct net_device **)res); +} + +int devm_lora_register_netdev(struct device *dev, struct net_device *net) +{ + struct net_device **ptr; + + ptr = devres_alloc(devm_lora_unregister, sizeof(*ptr), GFP_KERNEL); + if (!ptr) + return -ENOMEM; + + *ptr = net; + devres_add(dev, ptr); + + return 0; +} +EXPORT_SYMBOL_GPL(devm_lora_register_netdev); + static struct rtnl_link_ops lora_link_ops __read_mostly = { .kind = "lora", .setup = lora_setup, diff --git a/include/linux/lora/dev.h b/include/linux/lora/dev.h index 153f9b2..3f871c6 100644 --- a/include/linux/lora/dev.h +++ b/include/linux/lora/dev.h @@ -32,6 +32,7 @@ static inline int lora_strtoeui(const char *str, lora_eui *val) struct net_device *alloc_loradev(int sizeof_priv); void free_loradev(struct net_device *dev); +int devm_lora_register_netdev(struct device *dev, struct net_device *net); int register_loradev(struct net_device *dev); void unregister_loradev(struct net_device *dev); int open_loradev(struct net_device *dev); -- 2.7.4