From patchwork Fri Mar 9 14:46:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 131131 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp1081648lja; Fri, 9 Mar 2018 06:54:52 -0800 (PST) X-Google-Smtp-Source: AG47ELtGKDsWHJ4l73jj0vRZjiAQmun6WEqhr3pmsDLcf4iju/1TeqadADEo4v6s5YNUxgMyFoY/ X-Received: by 10.98.228.3 with SMTP id r3mr30490716pfh.77.1520607292762; Fri, 09 Mar 2018 06:54:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520607292; cv=none; d=google.com; s=arc-20160816; b=AJ5+jjK1RtOIt2Tot1hTPOHHTFqQ9PBQv/XNN2aK/3eTWbaf1PZ0YmJoyJ1YS81Ay8 GI0G5EJdDusxMO/O9oAKyyGB7WYfDYUhd9MpUPqvQDJfQNz1+jlTZw+JkyhJOmnTwfxA UJAOZlMSUywmEXbHDjVNnSVIan/5ex/fzKPJlFIFsu6Vw3QsA4Q/NYb2sI5+9Yk9t3Jn khbXsbe/VA/CeWsQFQ3+l0PxpnGAHovw09SQbS0RPOFPPx3lKl9hXmaLa/KUNHttif0f SRQ2pbHY3MfxUbfKaPaPxsfFlsF9vqWEczwp7xiV/G7PUqxvn4+0ZhHp00uCy81fFqT/ G9Sg== 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:arc-authentication-results; bh=mKP2TnGnWIK7Bi0xi2aUnSgI/KaYTC2r/mhx+bI51D4=; b=Co/VbV6fjMCe9nPSnqCxJIDCwQh0Uf4Q4Srel5uBk8WvXOfCQmY0GAWU0kJdLj8ra7 T/WybxF0j5JOlro0fb6WfSBbKZ6JD/AdNC2Q9CWXU5sHM2iIf9ZZcf1XPt8n9EX1pWFX mcNVmSNPbrVJipmnPsKKifO7W6f+w5SoWERGU+6HthN0RUPltCKSnL5vWuiLbvA0ksFg X89c3W3O1ttPOi1Wvn9aNdNUGgm5T9IJbJfyPzYMpvXYt0fkhAlVat+jDjRBDmkGZw2N rH4mcSWYQs9AQrwvrMi7uq8ZcmF+rHgwP7ndGDz06ZORHVCVtAcxK4UGMCkH/6Ifr+Kd YTEQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=e8TBcfp0; 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 l9si840959pgs.226.2018.03.09.06.54.52; Fri, 09 Mar 2018 06:54:52 -0800 (PST) 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=e8TBcfp0; 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 S932282AbeCIOug (ORCPT + 28 others); Fri, 9 Mar 2018 09:50:36 -0500 Received: from mail-wr0-f196.google.com ([209.85.128.196]:35057 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932144AbeCIOu3 (ORCPT ); Fri, 9 Mar 2018 09:50:29 -0500 Received: by mail-wr0-f196.google.com with SMTP id a27so1598773wra.2 for ; Fri, 09 Mar 2018 06:50:28 -0800 (PST) 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=mKP2TnGnWIK7Bi0xi2aUnSgI/KaYTC2r/mhx+bI51D4=; b=e8TBcfp0fVYGZzwb0+3DfUenLg3kgLADFzVIrrswDGbQPexM5qAVtZbaR5zzzPQ61s 4WvsbXlD9cI9Ynxx9xDlJSpAj0sgWWg92aE0dUAdbPTY2iRH6ndnqH2aJ6won86H1Erk qK8Tm9AXQ66RnfGmyUGSDN8fhuv0NSAHKT/1M= 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=mKP2TnGnWIK7Bi0xi2aUnSgI/KaYTC2r/mhx+bI51D4=; b=XIFLf/czaBPLIdc5m+ZTAI3sLmdTL//1CypFdGWz7izOr68yKppbKnIeovrfwjIqtx DApQOEQ+nBHpeA+w0dpxWgOkrRgO7PK+IrmY5TuAXniQuHo9AYKjJ/VH7y0sz8BqYtYR 0EgBwErlxYRePV8P8K8FnoqCG/fiPD30LsG2kz/v5A8HNd2zto8wtGzoLYBRO9COMI2b bZzi55zJSPkoO2X5IecLyp24ccyh8uOX3NHa5eWygLhhXhZhPypc7SyizERhAm2wu00H HAFEE7M0CW4LVevvFWt3xFgeKCyiiNgDIVRHW7M13OU5QOQf9vUl5+3f8oHHg4jRBGM7 Ic/Q== X-Gm-Message-State: APf1xPDT3Y1JeM4wmPJJog/FSJ9HXlnpIz2H+KPS9zS+xFzKn+Phk1sA ECqzA91GZBuLJlPvFk9AUN3pCA== X-Received: by 10.223.138.153 with SMTP id y25mr25606025wry.257.1520607028099; Fri, 09 Mar 2018 06:50:28 -0800 (PST) Received: from localhost.localdomain (cpc90716-aztw32-2-0-cust92.18-1.cable.virginm.net. [86.26.100.93]) by smtp.gmail.com with ESMTPSA id u48sm1191901wrb.85.2018.03.09.06.50.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 09 Mar 2018 06:50:27 -0800 (PST) From: srinivas.kandagatla@linaro.org To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, srinivas.kandagatla@linaro.org, Andrey Smirnov , Heiko Stuebner , Masahiro Yamada , Carlo Caione , Kevin Hilman , Matthias Brugger , cphealy@gmail.com, linux-mediatek@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 02/25] nvmem: core: Allow specifying device name verbatim Date: Fri, 9 Mar 2018 14:46:56 +0000 Message-Id: <20180309144719.29904-3-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180309144719.29904-1-srinivas.kandagatla@linaro.org> References: <20180309144719.29904-1-srinivas.kandagatla@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andrey Smirnov Add code to allow avoid having nvmem core append a numeric suffix to the end of the name by passing config->id of -1. Cc: Srinivas Kandagatla Cc: Heiko Stuebner Cc: Masahiro Yamada Cc: Carlo Caione Cc: Kevin Hilman Cc: Matthias Brugger Cc: cphealy@gmail.com Cc: linux-kernel@vger.kernel.org Cc: linux-mediatek@lists.infradead.org Cc: linux-rockchip@lists.infradead.org Cc: linux-amlogic@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Andrey Smirnov Signed-off-by: Srinivas Kandagatla --- drivers/nvmem/core.c | 11 ++++++++--- include/linux/nvmem-provider.h | 3 +++ 2 files changed, 11 insertions(+), 3 deletions(-) -- 2.15.1 diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index 35a3dbeea324..99e04cfcc723 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -473,9 +473,14 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) nvmem->reg_read = config->reg_read; nvmem->reg_write = config->reg_write; nvmem->dev.of_node = config->dev->of_node; - dev_set_name(&nvmem->dev, "%s%d", - config->name ? : "nvmem", - config->name ? config->id : nvmem->id); + + if (config->id == -1 && config->name) { + dev_set_name(&nvmem->dev, "%s", config->name); + } else { + dev_set_name(&nvmem->dev, "%s%d", + config->name ? : "nvmem", + config->name ? config->id : nvmem->id); + } nvmem->read_only = device_property_present(config->dev, "read-only") | config->read_only; diff --git a/include/linux/nvmem-provider.h b/include/linux/nvmem-provider.h index a39f76ff2ccd..b00567a07496 100644 --- a/include/linux/nvmem-provider.h +++ b/include/linux/nvmem-provider.h @@ -43,6 +43,9 @@ typedef int (*nvmem_reg_write_t)(void *priv, unsigned int offset, * Note: A default "nvmem" name will be assigned to the device if * no name is specified in its configuration. In such case "" is * generated with ida_simple_get() and provided id field is ignored. + * + * Note: Specifying name and setting id to -1 implies a unique device + * whose name is provided as-is (kept unaltered). */ struct nvmem_config { struct device *dev;