From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED, USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 051D4C43387 for ; Tue, 18 Dec 2018 16:05:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D018E21873 for ; Tue, 18 Dec 2018 16:05:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727086AbeLRQFA (ORCPT ); Tue, 18 Dec 2018 11:05:00 -0500 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:48978 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726739AbeLRQE7 (ORCPT ); Tue, 18 Dec 2018 11:04:59 -0500 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id BCF64A78; Tue, 18 Dec 2018 08:04:58 -0800 (PST) Received: from e107155-lin (e107155-lin.cambridge.arm.com [10.1.196.42]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id BCA903F5C0; Tue, 18 Dec 2018 08:04:52 -0800 (PST) Date: Tue, 18 Dec 2018 16:04:45 +0000 From: Sudeep Holla To: Thierry Reding Cc: Jassi Brar , linux-kernel@vger.kernel.org, Andy Gospodarek , Anup Patel , Bjorn Andersson , Caesar Wang , CK Hu , Dong Aisheng , Duc Dang , Eric Anholt , Fabien Dessenne , Feng Kan , Florian Fainelli , Georgi Djakov , Houlong Wei , HS Liao , Jon Mason , Kaihua Zhong , Kevin Wangtao , Lee Jones , Leo Yan , Ley Foon Tan , Ludovic Barre , Neil Armstrong , Nishanth Menon , Oleksij Rempel , Ray Jui , Rob Rice , Ruyi Wang , Scott Branden , Sibi Sankar , Stefan Wahren , Steve Lin , Suman Anna , Tony Lindgren , Vikram Prakash , Vladimir Zapolskiy , Sudeep Holla Subject: Re: [PATCH v2 01/19] mailbox: Add device-managed registration functions Message-ID: <20181218160445.GA32237@e107155-lin> References: <20181217150217.32435-1-thierry.reding@gmail.com> <20181217150217.32435-2-thierry.reding@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20181217150217.32435-2-thierry.reding@gmail.com> User-Agent: Mutt/1.9.4 (2018-02-28) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Dec 17, 2018 at 04:01:59PM +0100, Thierry Reding wrote: > From: Thierry Reding > > Add device-managed equivalents of the mbox_controller_register() and > mbox_controller_unregister() functions that can be used to have the > devres infrastructure automatically unregister mailbox controllers on > driver probe failure or driver removal. This can help remove a lot of > boiler plate code from drivers. > > Signed-off-by: Thierry Reding > --- > drivers/mailbox/mailbox.c | 70 ++++++++++++++++++++++++++++++ > include/linux/mailbox_controller.h | 5 +++ > 2 files changed, 75 insertions(+) > > diff --git a/drivers/mailbox/mailbox.c b/drivers/mailbox/mailbox.c > index 674b35f402f5..eb781e2b19cb 100644 > --- a/drivers/mailbox/mailbox.c > +++ b/drivers/mailbox/mailbox.c > @@ -515,3 +515,73 @@ void mbox_controller_unregister(struct mbox_controller *mbox) > mutex_unlock(&con_mutex); > } > EXPORT_SYMBOL_GPL(mbox_controller_unregister); > + > +static void __devm_mbox_controller_unregister(struct device *dev, void *res) > +{ > + struct mbox_controller *mbox = res; > + > + mbox_controller_unregister(mbox); This looks wrong to me. See below for details. [...] > +int devm_mbox_controller_register(struct device *dev, > + struct mbox_controller *mbox) > +{ > + struct mbox_controller **ptr; > + int err; > + > + ptr = devres_alloc(__devm_mbox_controller_unregister, sizeof(*ptr), > + GFP_KERNEL); devres_alloc returns devres->data as ptr above > + if (!ptr) > + return -ENOMEM; > + > + err = mbox_controller_register(mbox); > + if (err < 0) { > + devres_free(ptr); > + return err; > + } > + > + devres_add(dev, ptr); > + *ptr = mbox; And ...release is called with devres->data so we need *ptr in devm_mbox_controller_unregister and not ptr itself something like: struct mbox_controller **mbox = res; mbox_controller_unregister(*mbox); With above fixed: Reviewed-by: Sudeep Holla -- Regards, Sudeep