From patchwork Fri Jan 27 10:40:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 49178 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp763466wrn; Fri, 27 Jan 2023 02:42:25 -0800 (PST) X-Google-Smtp-Source: AMrXdXvrdg+sziGts5FLus9yjyPoIe7tjEyDHG23ctXreUDNhjnxZSEwb5emrccJqHdEbzURa8vW X-Received: by 2002:a17:902:bd83:b0:193:2bc9:eb25 with SMTP id q3-20020a170902bd8300b001932bc9eb25mr37602117pls.20.1674816145036; Fri, 27 Jan 2023 02:42:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674816145; cv=none; d=google.com; s=arc-20160816; b=rACDdBKLGZ1hXnq9S8XITuT/VYBFWRdfkm9UtfzXCWml9ziYIDG8kBpBiPoWiH3FXB O84aY6mGyF2sbXD4Xz9ChaqetrAIAvs3iZvzu4lUIUeyBHQlT6ZF85JQ4RKvZVdLadd7 sH+bpPUipZXjvCNO4jIeoZms8ks3d7/5LyIfLazUWb+RZ/Te5sQScvWHgWTLzq+WyWhP 4RVvnEaXpS+qohZdkg9m6hIj54Y3v2LLI5xHS1kR/luMLp9Scnys+k2Zf5kGt+NfBCFv F5voog3Gzc48V/xXP3+FaJEFgiJyIimOkaeSompCiUoRxYcpmfZFwqj1rrP/Y3va9hwg m/+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=GQA8ie8gDGnN9i1Gkqhn40XBHeOG+J3va8u+Gl+XlVM=; b=y/H/+BGzv+Xp2OSS8HJ+SLkUhiI5/QrY6yD33N/5KJD2CTpxVNCuhTQnYtz5JZaVX0 O5VCBpc3P+oplOdJ7BUQe7Pkx65U3VAcm2mSX4gTddL2GSfDFG7z6GfNVL5MAaTsB737 KU/fCj6DDi6ByU3HmpzSw4t5gdsG4X1jWKwLjke93ZbFDiz/9lwulrnD+BZ0jggeVoSI b7HdpIdngAo7pvhjqVtVBQmPMFWevdacILACEFK3fHnKznK3bGa35yw+EiMo/EjUYqve W1R4pv+l/k87/6g8ag9ER2iOn5luts72BPqulKpzqYeIhziikZFvjy/fMXaZhRrAdmSr RwpQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xUyNMLLS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n12-20020a1709026a8c00b00194c49857acsi4066624plk.226.2023.01.27.02.42.13; Fri, 27 Jan 2023 02:42:25 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xUyNMLLS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 S232085AbjA0Kkw (ORCPT + 99 others); Fri, 27 Jan 2023 05:40:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49880 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232116AbjA0Kkj (ORCPT ); Fri, 27 Jan 2023 05:40:39 -0500 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BCA782CC4B for ; Fri, 27 Jan 2023 02:40:28 -0800 (PST) Received: by mail-wm1-x331.google.com with SMTP id q8so3121508wmo.5 for ; Fri, 27 Jan 2023 02:40:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GQA8ie8gDGnN9i1Gkqhn40XBHeOG+J3va8u+Gl+XlVM=; b=xUyNMLLS9r+SAEJJHrAvAUjeGlDUCS0MsFCqN8jBJQOEBAteMPkiFOvkPkEtNggLbw g+IPrcJBOAaUPy/h+Bq87sYMPJcbBFWP/LTBijYpoovlnqmU/cXdZvpfPatgEamol52Q HULZRCbRz+Z2kfplRBjEsMa0HTvF0fB2w/qPA6w+Qth57PZ+4fQ11JKVqw2vAl9/6JqE B03LXZpbRoEkQScZKjgFvKdWQr6kBgDxosUNl3xO4OTy6PsfW7tSmpkmU2ULkFg5Ui9h r+qMtxDVGeQX2fB8/ywWsqKvrAHk2QzGVwwsZs/VJQqHgM1S+mjbecMkcIkXWdWqLqy8 4mSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GQA8ie8gDGnN9i1Gkqhn40XBHeOG+J3va8u+Gl+XlVM=; b=ALytOypMribMvb875Ioxbt6OdtBM14xnSamSO7PEsn3ApNkvgXuMmPOi9zVFwY54nH DzW9OQ6/MMHLP6LO4a5I7AHtCuXkkLQxBo0L8HujKrl4yTUnHlSP2ZGd1UWYr1LUwIrI npdP9CzWVJwmdJibt6CV1bUkcRF7pQFJjQuDATXlPRyCcCjEiFxHuI3hoeRPbS0Lx2Hs HjVKGGTy7/JbICRF3w1/HPEOrr8V5xXb21OeCFlumozv4lsoPjjTGVMS/PADlEcsGpqa T3gYiQ4rn6+KgK2GKdaBciv9S1xWnV91udtxFH0AQZb6ookPOPuZRjXs9aH1KoEcWhS4 7ccg== X-Gm-Message-State: AFqh2kpZ2j20upxB6VH5RK+UvsaI+hC3Qs6hc/rp9YMStrCBLl6SRzJi KvX57UJXmo7TH8/rl2Pelfd1tg== X-Received: by 2002:a05:600c:434b:b0:3d9:cc40:a8dc with SMTP id r11-20020a05600c434b00b003d9cc40a8dcmr37194425wme.27.1674816027291; Fri, 27 Jan 2023 02:40:27 -0800 (PST) Received: from localhost.localdomain ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id q9-20020a1ce909000000b003dc34edacf8sm1619787wmc.31.2023.01.27.02.40.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Jan 2023 02:40:26 -0800 (PST) From: Srinivas Kandagatla To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, "Russell King (Oracle)" , stable@vger.kernel.org, Srinivas Kandagatla Subject: [PATCH 04/10] nvmem: core: remove nvmem_config wp_gpio Date: Fri, 27 Jan 2023 10:40:09 +0000 Message-Id: <20230127104015.23839-5-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230127104015.23839-1-srinivas.kandagatla@linaro.org> References: <20230127104015.23839-1-srinivas.kandagatla@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756172014058768379?= X-GMAIL-MSGID: =?utf-8?q?1756172014058768379?= From: "Russell King (Oracle)" No one provides wp_gpio, so let's remove it to avoid issues with the nvmem core putting this gpio. Cc: stable@vger.kernel.org Signed-off-by: Russell King (Oracle) Signed-off-by: Srinivas Kandagatla --- drivers/nvmem/core.c | 4 +--- include/linux/nvmem-provider.h | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index 7394a7598efa..608f3ad2e2e4 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -772,9 +772,7 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) nvmem->id = rval; - if (config->wp_gpio) - nvmem->wp_gpio = config->wp_gpio; - else if (!config->ignore_wp) + if (!config->ignore_wp) nvmem->wp_gpio = gpiod_get_optional(config->dev, "wp", GPIOD_OUT_HIGH); if (IS_ERR(nvmem->wp_gpio)) { diff --git a/include/linux/nvmem-provider.h b/include/linux/nvmem-provider.h index 50caa117cb62..bb15c9234e21 100644 --- a/include/linux/nvmem-provider.h +++ b/include/linux/nvmem-provider.h @@ -70,7 +70,6 @@ struct nvmem_keepout { * @word_size: Minimum read/write access granularity. * @stride: Minimum read/write access stride. * @priv: User context passed to read/write callbacks. - * @wp-gpio: Write protect pin * @ignore_wp: Write Protect pin is managed by the provider. * * Note: A default "nvmem" name will be assigned to the device if @@ -85,7 +84,6 @@ struct nvmem_config { const char *name; int id; struct module *owner; - struct gpio_desc *wp_gpio; const struct nvmem_cell_info *cells; int ncells; const struct nvmem_keepout *keepout;