From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on archive.lwn.net X-Spam-Level: X-Spam-Status: No, score=-5.7 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham autolearn_force=no version=3.4.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by archive.lwn.net (Postfix) with ESMTP id D05957D57F for ; Fri, 7 Sep 2018 10:08:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728372AbeIGOsf (ORCPT ); Fri, 7 Sep 2018 10:48:35 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:35311 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728371AbeIGOsf (ORCPT ); Fri, 7 Sep 2018 10:48:35 -0400 Received: by mail-wr1-f68.google.com with SMTP id j26-v6so14395516wre.2 for ; Fri, 07 Sep 2018 03:08:21 -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=Ql67q/cvaDNfqNAJLZ2meBMvoRpSakM4XzL+fx23NO9k4x8rlyCD9s3n5YGDwet4/2 iwdk4tqwtt4FCURfcLMyJFJwG6Q6kvQ+uOtEiaLai1wldC8Ulu6OmBujeN93eoKQ1z+B K/jBklhrhuywVD6BztEtZjiZOWTwXjp/RfJhrtWWbgmLZ504+93EKiyBW990DdHipuKA ZpJy0tvsvkVk4IX+7MpqkklIA7YmQ5JPfmtiZfNnkbubr9fH1w+vUe7jx/oFy/MyK1o0 eGZH0fXT1HoXSZ1HPwlUbQ/m6r9xvIq0/g1yjo72/4J1Qc5l95XljX1MV5npITdl2Gz6 yp2A== 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=Z0L8Q9UfMMVhhnxfIO0rJZOlj+ZLRuxBLbUUP1ttw22Da/JhO6lPMfASLT2aIcFv+S FS2J7PvmWRoa0A7qlRK2PI6PDJPD+JqK60vBW1NipfMa/iGJsh+FS1mFRVlWjcSZPsyq a9k395f1I2OA3n/nqQqGyKKbaqjxdQz0WBLUtThz5sLTRxCg/D4bERfVFRPsL/rYpFUi reQ6PGsN9zg4KPz5Q9baKeqP3T8NCZba13XX2G5Bjtcj8u2O8t/s3P8Ib2IVdMm5HUkE rRyFuwS1XwAOdVSl+63SnoUmF1e4zl98IKrenzhHogAfNwG6JFiu068EEQVgxWzM1npv qdCQ== X-Gm-Message-State: APzg51BNoajlbgAkRicgqTTwXEH2sIOpwdzzHPidsJmckTVqKdKg9LxP XQEMua0cS0GVaemgC6gokkegZQ== X-Google-Smtp-Source: ANB0VdYrylm9/VwbLuJauYWuDUOk7RPP+KGu7xOSGEhxwmNnT4Jsl1L7HVUtvaGQhQLzXZcMdumofw== X-Received: by 2002:a5d:4a44:: with SMTP id v4-v6mr5551176wrs.278.1536314901286; Fri, 07 Sep 2018 03:08:21 -0700 (PDT) Received: from brgl-bgdev.baylibre.local (AStLambert-681-1-83-232.w90-86.abo.wanadoo.fr. [90.86.25.232]) by smtp.gmail.com with ESMTPSA id 72-v6sm6631619wrb.48.2018.09.07.03.08.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Sep 2018 03:08:20 -0700 (PDT) From: Bartosz Golaszewski To: Srinivas Kandagatla , "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 , Chen-Yu Tsai Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Bartosz Golaszewski Subject: [PATCH v2 02/16] nvmem: remove the global cell list Date: Fri, 7 Sep 2018 12:07:36 +0200 Message-Id: <20180907100750.14564-3-brgl@bgdev.pl> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180907100750.14564-1-brgl@bgdev.pl> References: <20180907100750.14564-1-brgl@bgdev.pl> Sender: linux-doc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-doc@vger.kernel.org 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: -- 2.18.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: brgl@bgdev.pl (Bartosz Golaszewski) Date: Fri, 7 Sep 2018 12:07:36 +0200 Subject: [PATCH v2 02/16] nvmem: remove the global cell list In-Reply-To: <20180907100750.14564-1-brgl@bgdev.pl> References: <20180907100750.14564-1-brgl@bgdev.pl> Message-ID: <20180907100750.14564-3-brgl@bgdev.pl> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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: -- 2.18.0