From patchwork Fri Jun 30 14:51:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jan_L=C3=BCbbe?= X-Patchwork-Id: 9819803 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 50A2E603F2 for ; Fri, 30 Jun 2017 14:52:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 30FFA2041F for ; Fri, 30 Jun 2017 14:52:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 234802865F; Fri, 30 Jun 2017 14:52:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id AA1DB2041F for ; Fri, 30 Jun 2017 14:52:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=S7WAvu51JPFkRphyC4N3Abvh8C7/PnLg4ra+DynNWb8=; b=uuuJ1TVidru+nWAOyuo4xXnKqP rbejGuv9VbbaRmOPUatNetALt1l4q9z0K29AkJ4oKY4mqiNI7RXHILxFcRgdSKadaWM+xv3TEYNVN GFDNdHvZGAEG1XE/eS+kSYLtksmx2PEQo048KXOizfKuYG1moi3FfI3s/aULGRs0JQS28J0FlGH1K w+tB+skWfcFU2z2K3Mz19muc7gKHjQBzKDYJ1o4m7YSSgc/8xXHuUjwGXJLwyLk/jKjVun5quHda0 6auVyWdudap+E+cbkO7wM7wFCrAhADETfzs3p2XKntZ+PqNqDjwPCN8KAz9AQFG3E3Qd5w30vMfQB T20F2SRw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dQxHQ-0004Gc-2K; Fri, 30 Jun 2017 14:52:20 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dQxH6-0003wX-Th for linux-arm-kernel@lists.infradead.org; Fri, 30 Jun 2017 14:52:03 +0000 Received: from dude.hi.pengutronix.de ([2001:67c:670:100:1d::7]) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1dQxGg-000884-2v; Fri, 30 Jun 2017 16:51:34 +0200 Received: from jlu by dude.hi.pengutronix.de with local (Exim 4.89) (envelope-from ) id 1dQxGe-0003Mf-9o; Fri, 30 Jun 2017 16:51:32 +0200 From: Jan Luebbe To: Chris Packham , linux-arm-kernel@lists.infradead.org, linux-edac@vger.kernel.org Subject: [PATCH 6/8] EDAC: Add devres helpers for edac_mc_alloc/edac_mc_add_mc(_with_groups) Date: Fri, 30 Jun 2017 16:51:04 +0200 Message-Id: <20170630145106.29820-7-jlu@pengutronix.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170630145106.29820-1-jlu@pengutronix.de> References: <20170630145106.29820-1-jlu@pengutronix.de> X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::7 X-SA-Exim-Mail-From: jlu@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170630_075201_385032_E43C9851 X-CRM114-Status: GOOD ( 10.49 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Petazzoni , Gregory CLEMENT , Jan Luebbe , kernel@pengutronix.de MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP These helpers simplify error handling in the _probe functions and automate deallocation in the _remove functions. Signed-off-by: Jan Luebbe --- drivers/edac/edac_mc.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/edac/edac_mc.h | 26 +++++++++++++++++++++++++ 2 files changed, 79 insertions(+) diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c index 480072139b7a..4d6759222592 100644 --- a/drivers/edac/edac_mc.c +++ b/drivers/edac/edac_mc.c @@ -517,6 +517,33 @@ void edac_mc_free(struct mem_ctl_info *mci) } EXPORT_SYMBOL_GPL(edac_mc_free); +/** + * devm_edac_mc_free() - Internal helper to call edac_mc_free from a devres + * action. + */ +static void devm_edac_mc_free(void *mci) +{ + edac_mc_free((struct mem_ctl_info *)mci); +} + +struct mem_ctl_info *devm_edac_mc_alloc(struct device *dev, + unsigned mc_num, + unsigned n_layers, + struct edac_mc_layer *layers, + unsigned sz_pvt) +{ + struct mem_ctl_info *mci; + mci = edac_mc_alloc(mc_num, n_layers, layers, sz_pvt); + if (!mci) + return mci; + + if (devm_add_action_or_reset(dev, devm_edac_mc_free, mci)) + return NULL; + + return mci; +} +EXPORT_SYMBOL_GPL(devm_edac_mc_alloc); + bool edac_has_mcs(void) { bool ret; @@ -828,6 +855,32 @@ struct mem_ctl_info *edac_mc_del_mc(struct device *dev) } EXPORT_SYMBOL_GPL(edac_mc_del_mc); +/** + * devm_edac_mc_del_mc() - Internal helper to call edac_mc_del_mc from a devres + * action. + */ +static void devm_edac_mc_del_mc(void *dev) +{ + edac_mc_del_mc((struct device *)dev); +} + +int devm_edac_mc_add_mc_with_groups(struct device *dev, + struct mem_ctl_info *mci, + const struct attribute_group **groups) +{ + int ret; + + ret = edac_mc_add_mc_with_groups(mci, groups); + if (ret) + return ret; + + if (devm_add_action_or_reset(dev, devm_edac_mc_del_mc, dev)) + return 1; + + return 0; +} +EXPORT_SYMBOL_GPL(devm_edac_mc_add_mc_with_groups); + static void edac_mc_scrub_block(unsigned long page, unsigned long offset, u32 size) { diff --git a/drivers/edac/edac_mc.h b/drivers/edac/edac_mc.h index 5357800e418d..c89f4301ed3f 100644 --- a/drivers/edac/edac_mc.h +++ b/drivers/edac/edac_mc.h @@ -149,6 +149,32 @@ extern int edac_mc_add_mc_with_groups(struct mem_ctl_info *mci, extern void edac_mc_free(struct mem_ctl_info *mci); /** + * devm_edac_mc_alloc() - Helper to call edac_mc_alloc() and register it for + * cleanup with devres. + * + * Returns: + * On success, return a pointer to struct mem_ctl_info pointer; + * %NULL otherwise + */ +struct mem_ctl_info *devm_edac_mc_alloc(struct device *dev, + unsigned mc_num, + unsigned n_layers, + struct edac_mc_layer *layers, + unsigned sz_pvt); + +/** + * devm_edac_mc_add_mc_with_groups() - Helper to call + * edac_mc_add_mc_with_groups() and register it for cleanup with devres. + * + * Returns: + * 0 on Success, or an error code on failure + */ +int devm_edac_mc_add_mc_with_groups(struct device *dev, + struct mem_ctl_info *mci, + const struct attribute_group **groups); +#define devm_edac_mc_add_mc(dev, mci) devm_edac_mc_add_mc_with_groups(dev, mci, NULL) + +/** * edac_has_mcs() - Check if any MCs have been allocated. * * Returns: