From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1755520AbbE2IkO (ORCPT <rfc822;w@1wt.eu>);
	Fri, 29 May 2015 04:40:14 -0400
Received: from mout.kundenserver.de ([212.227.17.24]:59029 "EHLO
	mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1753839AbbE2IkJ (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Fri, 29 May 2015 04:40:09 -0400
From: Arnd Bergmann <arnd@arndb.de>
To: Brian Norris <computersforpeace@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>, linux-mtd@lists.infradead.org,
        Dan Carpenter <dan.carpenter@oracle.com>,
        David Woodhouse <David.Woodhouse@intel.com>,
        Artem Bityutskiy <Artem.Bityutskiy@linux.intel.com>,
        linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: [PATCH] mtd: use cfi-util in jedecprobe
Date: Fri, 29 May 2015 10:39:28 +0200
Message-ID: <7230287.A5AxNMN3qP@wuerfel>
User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; )
MIME-Version: 1.0
Content-Transfer-Encoding: 7Bit
Content-Type: text/plain; charset="us-ascii"
X-Provags-ID: V03:K0:k8SIk/dCJ1WO+jqR1go5MxIRCvGargGZb3fIntgIuKq6jO+BMjE
 gnJIF6KHImwhi2ouHVOM/3Us1fDNStB5oCkMnWA2Vm/37piGCuMmaJtEXgfHBJ3U2oy9SIA
 1Nh0zhugh3oFoeatqpjCKGd/CqVK1s+eQgyZYgaw2QV5j60NA4N2lMESICFrXL48zRWvEiq
 gMasZLCvhN+SJ3kUejW7Q==
X-UI-Out-Filterresults: notjunk:1;
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

A recent change to move cfi helper functions out of line
is causing build errors when cfi-util is a loadable module
and jedecprobe is built-in:

drivers/built-in.o: In function `jedec_reset':
(.text+0x140694): undefined reference to `cfi_send_gen_cmd'
drivers/built-in.o: In function `jedec_probe_chip':
(.text+0x140794): undefined reference to `cfi_build_cmd_addr'

This adds a 'select' for the module containing these functions
from the jedecprobe code, to ensure it is always reachable.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 4612c715a6ea6 ("mtd: cfi: deinline large functions")

diff --git a/drivers/mtd/chips/Kconfig b/drivers/mtd/chips/Kconfig
index 6f20977f8cf6..63b6b536b044 100644
--- a/drivers/mtd/chips/Kconfig
+++ b/drivers/mtd/chips/Kconfig
@@ -16,6 +16,7 @@ config MTD_CFI
 config MTD_JEDECPROBE
 	tristate "Detect non-CFI AMD/JEDEC-compatible flash chips"
 	select MTD_GEN_PROBE
+	select MTD_CFI_UTIL
 	help
 	  This option enables JEDEC-style probing of flash chips which are not
 	  compatible with the Common Flash Interface, but will use the common