From patchwork Tue Jun 14 16:13:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 9176259 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id AC0246021C for ; Tue, 14 Jun 2016 16:14:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9D0B021327 for ; Tue, 14 Jun 2016 16:14:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 915DE28236; Tue, 14 Jun 2016 16:14:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1D4BA21327 for ; Tue, 14 Jun 2016 16:14:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752493AbcFNQNz (ORCPT ); Tue, 14 Jun 2016 12:13:55 -0400 Received: from arroyo.ext.ti.com ([198.47.19.12]:51706 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751364AbcFNQNx (ORCPT ); Tue, 14 Jun 2016 12:13:53 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id u5EGD7qs026358; Tue, 14 Jun 2016 11:13:07 -0500 Received: from DLEE70.ent.ti.com (dlemailx.itg.ti.com [157.170.170.113]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id u5EGD64A018817; Tue, 14 Jun 2016 11:13:06 -0500 Received: from dlep32.itg.ti.com (157.170.170.100) by DLEE70.ent.ti.com (157.170.170.113) with Microsoft SMTP Server id 14.3.294.0; Tue, 14 Jun 2016 11:13:04 -0500 Received: from [128.247.83.2] (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep32.itg.ti.com (8.14.3/8.13.8) with ESMTP id u5EGD4kx011729; Tue, 14 Jun 2016 11:13:04 -0500 Subject: [PATCH] hsi: Build hsi_boardinfo.c into hsi core if enabled To: kbuild test robot References: <201606140808.bRJtAy1i%fengguang.wu@intel.com> CC: , Russell King , Miguel Ojeda Sandonis , Linus Walleij , Sebastian Reichel , Wolfram Sang , Richard Purdie , Jacek Anaszewski , Rusty Russell , Benjamin Herrenschmidt , Mauro Carvalho Chehab , Ulf Hansson , Lauro Ramos Venancio , Aloisio Almeida Jr , Samuel Ortiz , Ingo Molnar , , , , , , , , , , From: "Andrew F. Davis" Message-ID: <57602D10.4080708@ti.com> Date: Tue, 14 Jun 2016 11:13:04 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.8.0 MIME-Version: 1.0 In-Reply-To: <201606140808.bRJtAy1i%fengguang.wu@intel.com> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If the HSI core is built as a module hsi_boardinfo may still be built-in as its Kconfig type is bool, which can cause build issues. Fix this by building this code into the HSI core when enabled. Reported-by: kbuild test robot Signed-off-by: Andrew F. Davis --- This build error seems to be due to Kconfig symbol CONFIG_HSI_BOARDINFO being a bool but depending on a tristate (CONFIG_HSI). This is normally okay when it is just a flag to enable a feature in source, but the helper code file hsi_boardinfo.c is built as a separate entity when enabled. This patch is probably how it was intended, and is more like how others do this kind of thing. This patch should be applied before the parent patch: drivers/hsi/Makefile | 3 ++- drivers/hsi/{hsi.c => hsi_core.c} | 0 2 files changed, 2 insertions(+), 1 deletion(-) rename drivers/hsi/{hsi.c => hsi_core.c} (100%) diff --git a/drivers/hsi/Makefile b/drivers/hsi/Makefile index 360371e..9694478 100644 --- a/drivers/hsi/Makefile +++ b/drivers/hsi/Makefile @@ -1,7 +1,8 @@ # # Makefile for HSI # -obj-$(CONFIG_HSI_BOARDINFO) += hsi_boardinfo.o obj-$(CONFIG_HSI) += hsi.o +hsi-objs := hsi_core.o +hsi-$(CONFIG_HSI_BOARDINFO) += hsi_boardinfo.o obj-y += controllers/ obj-y += clients/ diff --git a/drivers/hsi/hsi.c b/drivers/hsi/hsi_core.c similarity index 100% rename from drivers/hsi/hsi.c rename to drivers/hsi/hsi_core.c