From patchwork Mon Dec 24 15:14:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 154466 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp3981111ljp; Mon, 24 Dec 2018 07:15:27 -0800 (PST) X-Google-Smtp-Source: ALg8bN46bUiRmsuus6434L+2Zhtv2iacNWcseRWLZNtRnia/uvmSoeGFmpD8L/jmBLkwlKJf8uJA X-Received: by 2002:a17:902:b40d:: with SMTP id x13mr13557233plr.237.1545664527457; Mon, 24 Dec 2018 07:15:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545664527; cv=none; d=google.com; s=arc-20160816; b=nKHVmdtMBi1/CAooqUWSCad42RB84BdUjxykL3S+S0pq9cUkJHgqVNnI3wQO7ImztT PM7sPyU8sAwLNrL0uXynh21fyX1oP0Yn8sM9d4RCuwudF5f9G73aax26DK2pVbhxAx8u 81+MiLM+e21oqiRUBJeenJUN3Hi2VXHvOrEjGmqHJKkD1PzGg1Nd5ulEEXt1teBiCmbc qqr3BMYinY23tZzWR7UoW0LHzIfIxZA2DhtZyOq3a9nINpfOYG2FZRpPvV3NMX1AGZ1w vLIJ8w7ahFaBi3s9/65db3UJlQJPYwdxntX0zhf4yAubnVf/yKVWZCEUqoftIuIxq4KX V52g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=H3YjI/8O/6u00BHRCrJz6eQAGODFdfB1vFaxWglD9tg=; b=vOQ/nLW9h61pgbtw2232Ca+Dn1ILyxDPaOIDptbcqg9wMECXnSz1Qs547BetXfddRF br6nkgiK67IS869y/40wmDh4iiaJ1YE+cj8rJ9lCwcUSJlwUZ33EfF6budsuLJhdUehr A+EKYnyt3H2+eOOULXg8uo1EGNmxRCqAAiY86vdr7EmJVFXbIsHm+tWfCj2sQLjVUgoy t2VO2CHYLNUwRR2pEdRfp1PnOkpcmqNrp8SH1JjYDwkBY7Ktkn/89DTasmgcFwQBviX/ BemCyPj2/SIo8kpOuD2qcOyV6PCcd1+/Js0f8/G4k/z55eP7q+kezvxts5G0oUU2p7ZF BK9w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=cepODubr; 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 j3si10913742plk.199.2018.12.24.07.15.27; Mon, 24 Dec 2018 07:15:27 -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=@nifty.com header.s=dec2015msa header.b=cepODubr; 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 S1725799AbeLXPPX (ORCPT + 31 others); Mon, 24 Dec 2018 10:15:23 -0500 Received: from conuserg-12.nifty.com ([210.131.2.79]:62062 "EHLO conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725355AbeLXPPX (ORCPT ); Mon, 24 Dec 2018 10:15:23 -0500 Received: from grover.tkatk1.zaq.ne.jp (zaqdadce369.zaq.ne.jp [218.220.227.105]) (authenticated) by conuserg-12.nifty.com with ESMTP id wBOFF40N009889; Tue, 25 Dec 2018 00:15:04 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com wBOFF40N009889 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1545664505; bh=H3YjI/8O/6u00BHRCrJz6eQAGODFdfB1vFaxWglD9tg=; h=From:To:Cc:Subject:Date:From; b=cepODubrsY+jmLVSSSEd3f0broWxttirzCRXNsImv5ox5GZ2fn/9qErD4iDNmSd2N calcE0G8t9mhpJ0rOQ2FW+ccDksom9mSJgFmjiGTZhRyj5pCYu7/S5SqXwJP2ASths 0Dg/H9vnDG8uoobstTDC6yb8OC+kfKYISVIfGskdD/TcjAxFIitu+2MZsoZLCJzCpW maqRsHFhQ+ekwdqYlOry1M6N0eBDGW14PJRLAChbp4ibWiXtsYgz3xufBansUKMeWw YWzryzZJNa9I1DBfgrAhGfODPO50TDP4s4rgCrJe8H1DCSDduiOpHeleDFf0AgIp9F dEoY4U+6w9mCA== X-Nifty-SrcIP: [218.220.227.105] From: Masahiro Yamada To: Luis Chamberlain , linux-kernel@vger.kernel.org Cc: Masahiro Yamada , Greg Kroah-Hartman , "Rafael J. Wysocki" Subject: [PATCH] firmware_loader: move CONFIG_FW_LOADER_USER_HELPER switch to Makefile Date: Tue, 25 Dec 2018 00:14:57 +0900 Message-Id: <1545664497-26740-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The whole code of fallback_table.c is surrounded by #ifdef of CONFIG_FW_LOADER_USER_HELPER. Move the CONFIG_FW_LOADER_USER_HELPER switch to Makefile so that it is not compiled at all when this CONFIG is turned off. I also removed the confusing comment, "Module or buit-in [sic]". CONFIG_FW_LOADER_USER_HELPER is a boolean option. (If it were a module, CONFIG_FW_LOADER_USER_HELPER_MODULE would be defined instead.) Signed-off-by: Masahiro Yamada --- drivers/base/firmware_loader/Makefile | 2 +- drivers/base/firmware_loader/fallback_table.c | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) -- 2.7.4 diff --git a/drivers/base/firmware_loader/Makefile b/drivers/base/firmware_loader/Makefile index a97eeb0..5c7f422 100644 --- a/drivers/base/firmware_loader/Makefile +++ b/drivers/base/firmware_loader/Makefile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 # Makefile for the Linux firmware loader -obj-y := fallback_table.o +obj-$(CONFIG_FW_LOADER_USER_HELPER) += fallback_table.o obj-$(CONFIG_FW_LOADER) += firmware_class.o firmware_class-objs := main.o firmware_class-$(CONFIG_FW_LOADER_USER_HELPER) += fallback.o diff --git a/drivers/base/firmware_loader/fallback_table.c b/drivers/base/firmware_loader/fallback_table.c index 7428659..776dd69 100644 --- a/drivers/base/firmware_loader/fallback_table.c +++ b/drivers/base/firmware_loader/fallback_table.c @@ -16,9 +16,6 @@ * firmware fallback configuration table */ -/* Module or buit-in */ -#ifdef CONFIG_FW_LOADER_USER_HELPER - static unsigned int zero; static unsigned int one = 1; @@ -51,5 +48,3 @@ struct ctl_table firmware_config_table[] = { { } }; EXPORT_SYMBOL_GPL(firmware_config_table); - -#endif