From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ben Whitten Subject: [PATCH lora-next v2 1/8] net: lora: add methods for devm registration Date: Thu, 9 Aug 2018 13:33:31 +0100 Message-ID: <1533818018-29005-1-git-send-email-ben.whitten@lairdtech.com> Cc: starnight@g.ncu.edu.tw, hasnain.virk@arm.com, netdev@vger.kernel.org, liuxuenetmail@gmail.com, shess@hessware.de, Ben Whitten To: afaerber@suse.de Return-path: Received: from mail-wm0-f66.google.com ([74.125.82.66]:52734 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727786AbeHIO7O (ORCPT ); Thu, 9 Aug 2018 10:59:14 -0400 Received: by mail-wm0-f66.google.com with SMTP id o11-v6so35447wmh.2 for ; Thu, 09 Aug 2018 05:34:32 -0700 (PDT) Sender: netdev-owner@vger.kernel.org List-ID: Follow the devm model so that we can avoid lengthy unwind code. Signed-off-by: Ben Whitten --- drivers/net/lora/dev.c | 28 ++++++++++++++++++++++++++++ include/linux/lora/dev.h | 1 + 2 files changed, 29 insertions(+) diff --git a/drivers/net/lora/dev.c b/drivers/net/lora/dev.c index 8c01106..e32a870 100644 --- a/drivers/net/lora/dev.c +++ b/drivers/net/lora/dev.c @@ -84,6 +84,34 @@ void free_loradev(struct net_device *dev) } EXPORT_SYMBOL_GPL(free_loradev); +static void devm_free_loradev(struct device *dev, void *res) +{ + struct net_device *net = (*(struct net_device **)res); + free_loradev(net); +} + +struct net_device *devm_alloc_loradev(struct device *dev, size_t priv) +{ + struct net_device **ptr; + struct net_device *net; + + net = alloc_loradev(priv); + if (!net) + return NULL; + + ptr = devres_alloc(devm_free_loradev, sizeof(*ptr), GFP_KERNEL); + if (!ptr) { + free_loradev(net); + return NULL; + } + + *ptr = net; + devres_add(dev, ptr); + + return net; +} +EXPORT_SYMBOL_GPL(devm_alloc_loradev); + 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..0f600c9 100644 --- a/include/linux/lora/dev.h +++ b/include/linux/lora/dev.h @@ -31,6 +31,7 @@ static inline int lora_strtoeui(const char *str, lora_eui *val) } struct net_device *alloc_loradev(int sizeof_priv); +struct net_device *devm_alloc_loradev(struct device *dev, size_t priv); void free_loradev(struct net_device *dev); int register_loradev(struct net_device *dev); void unregister_loradev(struct net_device *dev); -- 2.7.4