From patchwork Mon Oct 21 10:58:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 177064 Delivered-To: patch@linaro.org Received: by 2002:a92:409a:0:0:0:0:0 with SMTP id d26csp3245485ill; Mon, 21 Oct 2019 03:58:46 -0700 (PDT) X-Google-Smtp-Source: APXvYqwTNldQv8ZBvhscW2tPsC4kgJ7wQWzKCJO7+JV75M1fXXNC03E4Ncybur9yJG9U8R/d2MYP X-Received: by 2002:a17:906:3053:: with SMTP id d19mr21851089ejd.109.1571655525979; Mon, 21 Oct 2019 03:58:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571655525; cv=none; d=google.com; s=arc-20160816; b=B5G+sfsavQpiMh9XfE476/2v6dQAo2fL8pMoOIbpdux7nOw/vhMYvI6NHfomPnCE8D JmHo9M68W3Z2urh/72PR78CcgRglZzJ+vZK+bzqUdY2N0b5d4xti/atK1tJhYasIZU8E bKDNyuCjCdfWy7BH0gWLVDLUEh7jgWqhfVXWBw27Ap3x3lTi4Swfkf7ZJfWAioLge+XQ 7DKQDUvzMmxmI6sbQCOUhwZ3tad7GACITLNmyjq383cDiUGbsO3s82GfTNwDWQovFVdS 9sJfB6JHY3IXgRnCTdL0tabyxQDtUEgLNMyYg93UssDBNQIA9jA8+RvgpV1X1Gbr4/Rl gqdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=IbXKOY/JOfOJZSRWAViTfLDMweZJVT8cxQjaKThEJUs=; b=HZXEijfX4rpaoBk619HvR+KY6rArJkU4SrlGK5n60ewvBY4lR/7lHvEi2wRR8l8lnY qri4Bsnxhlv2nsuMNRkBB3C8qJYruKxwg29KIFF48Tfme6xgWju4SSfmP3UtDSp7oNhj P/AT+TwEFOwlGS/PlbiPnMpgtclMqcsIPh/epTHGlfrYpvpL4sMVzOsW6B1+qIdQd52h J3gj6rHx3BnMYPY6R/jHDLZBjyQklpQtgcN7KYGxR9pmUNq7YLDQjWR7JvJU8VnXqY0B munzJiRL7U3whDH6PC4Ow2uHW81YDXkdPk9UKyDjyplMlSG2jRQUV3i/8uD5j7I48qR+ fcOw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="g2YD/r70"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o21si852687eja.318.2019.10.21.03.58.45; Mon, 21 Oct 2019 03:58:45 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="g2YD/r70"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728391AbfJUK6o (ORCPT + 26 others); Mon, 21 Oct 2019 06:58:44 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:36934 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728348AbfJUK6g (ORCPT ); Mon, 21 Oct 2019 06:58:36 -0400 Received: by mail-wr1-f68.google.com with SMTP id e11so4701289wrv.4 for ; Mon, 21 Oct 2019 03:58:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=IbXKOY/JOfOJZSRWAViTfLDMweZJVT8cxQjaKThEJUs=; b=g2YD/r70AWQyO+VHPtEGhGPosKYW86edskEOwPZfS49Q++wZv6N1rnQKxBatV5B7xd 0tigIl5sw+dR7G0KTeD1okgY6m2eNO1BfQtAPbZw4m/PLaNZkNEX6VJBCxzrzdufBgrQ KC9GA121S5U9QeZlCEDMD1eoEewRJk/MGmRUmVwaFV15KX/KHkJo0g9OAP4d0zqg1pXz PFWtICDTNfEC6sKpBZ/k7V5lxnH8DLwG7hV78bsnGqX1+kd2vpdvjil2uYr3vMH6HTpX 0L0lD0UFh3vgDiGSKDEfDZlRsIt0r1JaB+w+wLd4bZztkTCSb5RfwHoOCWDneAE4+GK5 PSCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=IbXKOY/JOfOJZSRWAViTfLDMweZJVT8cxQjaKThEJUs=; b=Li5MEeribnIGOmSt0WH90cTu4Y7b1ut7eqE1Lex66iapzmmH0gbAcSZtts2fEJg0Il QFLfXEFbRsKH07ODlQVOcJbGdK0ugPVoIJdX2zvdbWXuit6VKhWJH9FqCXu3KOjWPOaR o2nc+2My2nzXmu4i+xnrW1avENkYvsw6baEopspsBKKc9bTcquAd810S9QkbdMjUa4pU rBspsEdhhHzkxrO/oRqx9m8p/ZY8c9mGICzfhXwOm5ZYImCToxtXV+KKK07BfNoEhjy/ p5kxJhYCaDOwtZBBBED7MWt/NwvekRk0YSprgutB0ejmq35Enb4Hqql4/xeZ7V+au8Ds YVww== X-Gm-Message-State: APjAAAWKLz2x1uSbLZ4GwTK01lobSrDvQBp+BfAkHiWBA6m+aHjKqNcK xb7ZVAmYiiPHgEvpCJjtaNYCvw== X-Received: by 2002:a5d:6a8b:: with SMTP id s11mr12752681wru.394.1571655513309; Mon, 21 Oct 2019 03:58:33 -0700 (PDT) Received: from localhost.localdomain ([95.149.164.99]) by smtp.gmail.com with ESMTPSA id q22sm12544289wmj.31.2019.10.21.03.58.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Oct 2019 03:58:32 -0700 (PDT) From: Lee Jones To: daniel.thompson@linaro.org, arnd@arndb.de, broonie@kernel.org, linus.walleij@linaro.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, baohua@kernel.org, stephan@gerhold.net, Lee Jones Subject: [PATCH v2 8/9] mfd: mfd-core: Remove usage counting for .{en, dis}able() call-backs Date: Mon, 21 Oct 2019 11:58:21 +0100 Message-Id: <20191021105822.20271-9-lee.jones@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191021105822.20271-1-lee.jones@linaro.org> References: <20191021105822.20271-1-lee.jones@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The MFD implementation for reference counting was complex and unnecessary. There was only one bona fide user which has now been converted to handle the process in a different way. Any future resource protection, shared enablement functions should be handed by the parent device, rather than through the MFD subsystem API. Signed-off-by: Lee Jones --- drivers/mfd/mfd-core.c | 57 +++++++--------------------------------- include/linux/mfd/core.h | 2 -- 2 files changed, 9 insertions(+), 50 deletions(-) -- 2.17.1 Reviewed-by: Daniel Thompson diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c index 90b43b44a15a..5d56015baeeb 100644 --- a/drivers/mfd/mfd-core.c +++ b/drivers/mfd/mfd-core.c @@ -26,53 +26,31 @@ static struct device_type mfd_dev_type = { int mfd_cell_enable(struct platform_device *pdev) { const struct mfd_cell *cell = mfd_get_cell(pdev); - int err = 0; if (!cell->enable) { dev_dbg(&pdev->dev, "No .enable() call-back registered\n"); return 0; } - /* only call enable hook if the cell wasn't previously enabled */ - if (atomic_inc_return(cell->usage_count) == 1) - err = cell->enable(pdev); - - /* if the enable hook failed, decrement counter to allow retries */ - if (err) - atomic_dec(cell->usage_count); - - return err; + return cell->enable(pdev); } EXPORT_SYMBOL(mfd_cell_enable); int mfd_cell_disable(struct platform_device *pdev) { const struct mfd_cell *cell = mfd_get_cell(pdev); - int err = 0; if (!cell->enable) { dev_dbg(&pdev->dev, "No .disable() call-back registered\n"); return 0; } - /* only disable if no other clients are using it */ - if (atomic_dec_return(cell->usage_count) == 0) - err = cell->disable(pdev); - - /* if the disable hook failed, increment to allow retries */ - if (err) - atomic_inc(cell->usage_count); - - /* sanity check; did someone call disable too many times? */ - WARN_ON(atomic_read(cell->usage_count) < 0); - - return err; + return cell->disable(pdev); } EXPORT_SYMBOL(mfd_cell_disable); static int mfd_platform_add_cell(struct platform_device *pdev, - const struct mfd_cell *cell, - atomic_t *usage_count) + const struct mfd_cell *cell) { if (!cell) return 0; @@ -81,7 +59,6 @@ static int mfd_platform_add_cell(struct platform_device *pdev, if (!pdev->mfd_cell) return -ENOMEM; - pdev->mfd_cell->usage_count = usage_count; return 0; } @@ -144,7 +121,7 @@ static inline void mfd_acpi_add_device(const struct mfd_cell *cell, #endif static int mfd_add_device(struct device *parent, int id, - const struct mfd_cell *cell, atomic_t *usage_count, + const struct mfd_cell *cell, struct resource *mem_base, int irq_base, struct irq_domain *domain) { @@ -206,7 +183,7 @@ static int mfd_add_device(struct device *parent, int id, goto fail_alias; } - ret = mfd_platform_add_cell(pdev, cell, usage_count); + ret = mfd_platform_add_cell(pdev, cell); if (ret) goto fail_alias; @@ -296,16 +273,9 @@ int mfd_add_devices(struct device *parent, int id, { int i; int ret; - atomic_t *cnts; - - /* initialize reference counting for all cells */ - cnts = kcalloc(n_devs, sizeof(*cnts), GFP_KERNEL); - if (!cnts) - return -ENOMEM; for (i = 0; i < n_devs; i++) { - atomic_set(&cnts[i], 0); - ret = mfd_add_device(parent, id, cells + i, cnts + i, mem_base, + ret = mfd_add_device(parent, id, cells + i, mem_base, irq_base, domain); if (ret) goto fail; @@ -316,17 +286,15 @@ int mfd_add_devices(struct device *parent, int id, fail: if (i) mfd_remove_devices(parent); - else - kfree(cnts); + return ret; } EXPORT_SYMBOL(mfd_add_devices); -static int mfd_remove_devices_fn(struct device *dev, void *c) +static int mfd_remove_devices_fn(struct device *dev, void *data) { struct platform_device *pdev; const struct mfd_cell *cell; - atomic_t **usage_count = c; if (dev->type != &mfd_dev_type) return 0; @@ -337,20 +305,13 @@ static int mfd_remove_devices_fn(struct device *dev, void *c) regulator_bulk_unregister_supply_alias(dev, cell->parent_supplies, cell->num_parent_supplies); - /* find the base address of usage_count pointers (for freeing) */ - if (!*usage_count || (cell->usage_count < *usage_count)) - *usage_count = cell->usage_count; - platform_device_unregister(pdev); return 0; } void mfd_remove_devices(struct device *parent) { - atomic_t *cnts = NULL; - - device_for_each_child_reverse(parent, &cnts, mfd_remove_devices_fn); - kfree(cnts); + device_for_each_child_reverse(parent, NULL, mfd_remove_devices_fn); } EXPORT_SYMBOL(mfd_remove_devices); diff --git a/include/linux/mfd/core.h b/include/linux/mfd/core.h index bd8c0e089164..919f09fb07b7 100644 --- a/include/linux/mfd/core.h +++ b/include/linux/mfd/core.h @@ -30,8 +30,6 @@ struct mfd_cell { const char *name; int id; - /* refcounting for multiple drivers to use a single cell */ - atomic_t *usage_count; int (*enable)(struct platform_device *dev); int (*disable)(struct platform_device *dev);