From patchwork Mon Sep 4 11:41:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 111551 Delivered-To: patch@linaro.org Received: by 10.37.128.210 with SMTP id c18csp4119022ybm; Mon, 4 Sep 2017 04:42:16 -0700 (PDT) X-Google-Smtp-Source: ADKCNb7vKb8hrDtGEeituNDDDezfvSRXk3K/UyBRYg43JwpZhoE81Dq8buK+jFFFNdPhZ6S95zxz X-Received: by 10.84.129.34 with SMTP id 31mr369977plb.282.1504525336399; Mon, 04 Sep 2017 04:42:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504525336; cv=none; d=google.com; s=arc-20160816; b=0jxFWzarBeSqKB5n6uSC+lXxTn/E78AIyA3xJWPO+F6GAgmJs728E7CRkRYLE9bM7a MBJ++TAeoXMennSdt20zuM9vLdJm5qM1tGqUyh1BmmRqTV3cWIr4GbVpYS0stc6Nv9rO PRYOwaodMqq1V3y+ccGaN0OU63YzkD8U1qxFHlghM+1JDrt8JZhrLBFC/ulBfBn/vTfk H7/WTGs8571xjUqVXeOJRXo/zdKOzgL46rIMIZnCKoHFJv0KbGcd0g5rB9V2K8pbn+WR 0XIZyNTaBGWbIfauOojs2tNeOq4JEjnw+h5XT0pFZpdAwcBBrVibU1JJbIZ81wKVjDlJ A4xw== 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:dkim-filter :arc-authentication-results; bh=wk7+WyeLvqQqBu6Ezb0F1c59/7YALb9PWQI/JPytQuU=; b=EEZEs3tYw4tgSjdV3RsfdsuM2n9e1J8C6fNx9YhxftbYKu93PkcqmuhiFjocbk/VDR 297fMv3FGLiDj3zQqKwNIbIkcJJxa1DWbPXgAgHbGOaTHp0KLyOvuJKFfgDBDx5I4/Mz 4pQSICj44z1+2AF1OHQI/u41igc1Jptzxssw5pkOQv986udvzVk9GTrda7G9n8ipVLKB F01NFVbFL+gdtZjCyn8xBqp7Nx9E4TamLjyNN5RhAJrBlZ7R+cHoIfTE8MRnn0fPAM/7 qchou5FKfT0ZJT4ICnP0rbaOElTmVeai9El9kLdqpMTGHOiTs5D7k+nHBDujl9e3SiNt SNZw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=nN6Wj0bh; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 67si4856837pfy.65.2017.09.04.04.42.16; Mon, 04 Sep 2017 04:42:16 -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=@nifty.com header.s=dec2015msa header.b=nN6Wj0bh; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753661AbdIDLmN (ORCPT + 26 others); Mon, 4 Sep 2017 07:42:13 -0400 Received: from conuserg-10.nifty.com ([210.131.2.77]:43691 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753638AbdIDLmL (ORCPT ); Mon, 4 Sep 2017 07:42:11 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-10.nifty.com with ESMTP id v84BfT4t006520; Mon, 4 Sep 2017 20:41:31 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com v84BfT4t006520 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1504525291; bh=wk7+WyeLvqQqBu6Ezb0F1c59/7YALb9PWQI/JPytQuU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nN6Wj0bheWr+IwtdUOZDmGRlSNkt3Yg30Sj2coRQiv9nQa6lBQbFiz0SLrQQknaAr K7j6qy4CH0cdDIDxxanLqIXxMK2sH2FcpeTvr+N6HrsI3vxEZb7ZV65U5PgkhdfOFm J6Nb1wzjyODBI/HpD2XkMCKp92NK0qUYP27GLVuY+YulwY0q6qBVH85aEqlwVj7idd DsBIj4YES540SbIBc/DyzGpp8VY1MN1iWLtkOB0TXKyhlPCRZCAI18Axo814avmIUg 1pcOp/8dP2WVdb0fDJc+m3NB2uo9QTYIq7QJ/G8eqF0gjN2amhnBidsm4n+6YY8ycq MlypeCT2jsvlw== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: Srinivas Kandagatla Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 3/3] nvmem: remove unneeded IS_ENABLED(CONFIG_NVMEM) conditional Date: Mon, 4 Sep 2017 20:41:16 +0900 Message-Id: <1504525276-11507-4-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1504525276-11507-1-git-send-email-yamada.masahiro@socionext.com> References: <1504525276-11507-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org As you see in drivers/nvmem/Makefile, this C file is compiled only when CONFIG_NVMEM is y or m. So, IS_ENABLED(CONFIG_NVMEM) is always evaluated to 1 in this file. Signed-off-by: Masahiro Yamada --- drivers/nvmem/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.7.4 diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index 8d915da..ebdc817 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -615,7 +615,7 @@ static struct nvmem_device *nvmem_find(const char *name) return to_nvmem_device(d); } -#if IS_ENABLED(CONFIG_NVMEM) && IS_ENABLED(CONFIG_OF) +#if IS_ENABLED(CONFIG_OF) /** * of_nvmem_device_get() - Get nvmem device from a given id * @@ -753,7 +753,7 @@ static struct nvmem_cell *nvmem_cell_get_from_list(const char *cell_id) return cell; } -#if IS_ENABLED(CONFIG_NVMEM) && IS_ENABLED(CONFIG_OF) +#if IS_ENABLED(CONFIG_OF) /** * of_nvmem_cell_get() - Get a nvmem cell from given device node and cell id *