From patchwork Wed Sep 5 09:57:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10588683 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id F17B313AC for ; Wed, 5 Sep 2018 10:00:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C5C27298AE for ; Wed, 5 Sep 2018 10:00:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B7B68298D8; Wed, 5 Sep 2018 10:00:14 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 555EC298AE for ; Wed, 5 Sep 2018 10:00:14 +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=KaJlZ5xxA6Ebbk88EoPOirRmJaZ+DHyZmlfK/My+Sg8=; b=JtEcYTaedhI5TRdpmkTN9Tb5rL buLpPZhvDpPIVXRWNzsRtCe5wMr2eHL8NMuHMD9qqmxthZ0Ujn2L/zD4MSwIGJMGRSzpVKJBMONSL EQu7/J8uLQy9w5ykZkSqbvWYAtekrm4I15m7Ug+Bog4KS9e0Lpi1B+9BEtkfNqG7bMTUR1WkLAoBl RgP/SgS4E0xDn/lPESiOL7W2aJ1VP0QJoAzwUNIxiswd+Iu7H59ymiTZnRUGAHU9B0EfwpFCjTZ4d 12oLrwgfYM6svYZOVKjsIuKIy2f49qv+yDX+KpRy34QVDVzi6X+kJ+XJbBWBeo1AxDEGXL26ytvJz fgCfRfcw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fxUbV-0004IO-UV; Wed, 05 Sep 2018 10:00:06 +0000 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fxUZk-0003Sy-42 for linux-arm-kernel@lists.infradead.org; Wed, 05 Sep 2018 09:58:20 +0000 Received: by mail-wr1-x442.google.com with SMTP id j26-v6so6990822wre.2 for ; Wed, 05 Sep 2018 02:58:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=OkoqiLjbJSODXJoiTP2mWCeOVuHWiRrCaV2oGASjKkw=; b=oO+MooOIqNoUEuBIrePFnK6OJR5c/sBLGef0RbivSEySPKXncBhcnCLBmvXcUy2Ly3 9TJNH20HeBHKqT/x3ZXHhjebTFajBeHZfXVcz9tG4IySKG+BcadumSTEgvqJhMOUEGCj 6ULz9kX+pKK0osh+aDk4IyoJtgDuustMTkCW4SO2sEwd4ebY6LADDahvMAQ6qHLir0KU 6Wza8XluLjqangrGgsTfoxoOYDAQu3z7PQzXTnDYla6kgJAuwE7gpgg7Xr/q7BGWQhz5 /XtYedxnaGQ+F232vQRJ4iFooi4ihBo3PXb9zGQ18fNnfzHKR0zpeQkLQHe2m95WhF3S Cstg== 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=OkoqiLjbJSODXJoiTP2mWCeOVuHWiRrCaV2oGASjKkw=; b=mDX4B0sRQBCZ0/8xiNik+Ig+Og46kW4BBzB2S/08XGk1kZqwepMWwbmNVLHZ3U/78S SsBPabXyJBFSCeQLbQaPbhMcZgVxf8MfOrcEVR3i4MGmfWTyzwr+rSEBqRNi7haLXH52 iQOW/iqQ6a836KD9cJuDT4trtZzaGagPwrwBffMs66IUmTYPuOAzLjcdaUh7rYPBNSg9 u74Xnv2bxcEEm4qygjvvNhPbXC1mEpatPdMyxoNCtOGTlzVNJ/ixxRKu8FgkZyVpiaYA kuXxmAaF6aLtc9+yTTuCrBp69ADaMudDieVqR1Nc76der+VsPUg5hKuG1ymLcQh7Irra bXPA== X-Gm-Message-State: APzg51BgKT3qxqdT7G+7mIkBKvskktGGkY+gcDI76Q05nJgFNBYQ9u2K mmYrukKag8/+6I5rhBvike7oOw== X-Google-Smtp-Source: ANB0VdYIhDfKPfOzmKKnB/xKQxcFzeSlAamYSL3GZHXJtNdlwU4Qx5ti/3g9l8tFf0Sop3n05rv0kA== X-Received: by 2002:adf:e792:: with SMTP id n18-v6mr14381020wrm.136.1536141486499; Wed, 05 Sep 2018 02:58:06 -0700 (PDT) Received: from brgl-bgdev.baylibre.local (AStLambert-681-1-33-235.w90-86.abo.wanadoo.fr. [90.86.152.235]) by smtp.gmail.com with ESMTPSA id l12-v6sm2127815wrv.29.2018.09.05.02.58.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Sep 2018 02:58:05 -0700 (PDT) From: Bartosz Golaszewski To: Srinivas Kandagatla , Joachim Eastwood , "David S . Miller" , Mauro Carvalho Chehab , Greg Kroah-Hartman , Andrew Morton , Arnd Bergmann , Jonathan Corbet , Sekhar Nori , Kevin Hilman , David Lechner , Boris Brezillon , Andrew Lunn , Alban Bedel , Maxime Ripard Subject: [PATCH 02/13] nvmem: remove the global cell list Date: Wed, 5 Sep 2018 11:57:27 +0200 Message-Id: <20180905095738.26406-3-brgl@bgdev.pl> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180905095738.26406-1-brgl@bgdev.pl> References: <20180905095738.26406-1-brgl@bgdev.pl> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180905_025816_215360_DDE2748F X-CRM114-Status: GOOD ( 13.70 ) 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: Bartosz Golaszewski , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org 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 From: Bartosz Golaszewski Make each nvmem device the owner of its nvmem cells. Signed-off-by: Bartosz Golaszewski --- drivers/nvmem/core.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index bb475c2688f9..86af62e2df47 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -38,6 +38,7 @@ struct nvmem_device { int flags; struct bin_attribute eeprom; struct device *base_dev; + struct list_head cells; nvmem_reg_read_t reg_read; nvmem_reg_write_t reg_write; void *priv; @@ -58,9 +59,6 @@ struct nvmem_cell { static DEFINE_MUTEX(nvmem_mutex); static DEFINE_IDA(nvmem_ida); -static LIST_HEAD(nvmem_cells); -static DEFINE_MUTEX(nvmem_cells_mutex); - #ifdef CONFIG_DEBUG_LOCK_ALLOC static struct lock_class_key eeprom_lock_key; #endif @@ -284,29 +282,25 @@ static struct nvmem_device *of_nvmem_find(struct device_node *nvmem_np) static void nvmem_cell_drop(struct nvmem_cell *cell) { - mutex_lock(&nvmem_cells_mutex); + mutex_lock(&nvmem_mutex); list_del(&cell->node); - mutex_unlock(&nvmem_cells_mutex); + mutex_unlock(&nvmem_mutex); kfree(cell); } -static void nvmem_device_remove_all_cells(const struct nvmem_device *nvmem) +static void nvmem_device_remove_all_cells(struct nvmem_device *nvmem) { - struct nvmem_cell *cell; - struct list_head *p, *n; + struct nvmem_cell *cell, *p; - list_for_each_safe(p, n, &nvmem_cells) { - cell = list_entry(p, struct nvmem_cell, node); - if (cell->nvmem == nvmem) - nvmem_cell_drop(cell); - } + list_for_each_entry_safe(cell, p, &nvmem->cells, node) + nvmem_cell_drop(cell); } static void nvmem_cell_add(struct nvmem_cell *cell) { - mutex_lock(&nvmem_cells_mutex); - list_add_tail(&cell->node, &nvmem_cells); - mutex_unlock(&nvmem_cells_mutex); + mutex_lock(&nvmem_mutex); + list_add_tail(&cell->node, &cell->nvmem->cells); + mutex_unlock(&nvmem_mutex); } /* @@ -423,6 +417,8 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) goto err_device_del; } + INIT_LIST_HEAD(&nvmem->cells); + return nvmem; err_device_del: