From: akpm@linux-foundation.org Subject: [merged] pcmcia-badge4-avoid-unused-function-warning.patch removed from -mm tree Date: Mon, 20 Nov 2017 13:27:00 -0800 Message-ID: <20171120212700.cAC0DnbD_%akpm@linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from mail.linuxfoundation.org ([140.211.169.12]:41012 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752831AbdKTV1B (ORCPT ); Mon, 20 Nov 2017 16:27:01 -0500 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: arnd@arndb.de, mm-commits@vger.kernel.org, rmk@armlinux.org.uk The patch titled Subject: drivers/pcmcia/sa1111_badge4.c: avoid unused function warning has been removed from the -mm tree. Its filename was pcmcia-badge4-avoid-unused-function-warning.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Arnd Bergmann Subject: drivers/pcmcia/sa1111_badge4.c: avoid unused function warning pcmv_setup() is only used when the badge4 driver is built-in, but not when it is a loadable module: drivers/pcmcia/sa1111_badge4.c:153:122: error: 'pcmv_setup' defined but not used [-Werror=unused-function] This adds an #ifdef to avoid the definition of the unused function in the modular case. Link: http://lkml.kernel.org/r/20170911201133.3421636-1-arnd@arndb.de Signed-off-by: Arnd Bergmann Cc: Russell King Signed-off-by: Andrew Morton --- drivers/pcmcia/sa1111_badge4.c | 2 ++ 1 file changed, 2 insertions(+) diff -puN drivers/pcmcia/sa1111_badge4.c~pcmcia-badge4-avoid-unused-function-warning drivers/pcmcia/sa1111_badge4.c --- a/drivers/pcmcia/sa1111_badge4.c~pcmcia-badge4-avoid-unused-function-warning +++ a/drivers/pcmcia/sa1111_badge4.c @@ -144,6 +144,7 @@ int pcmcia_badge4_init(struct sa1111_dev sa11xx_drv_pcmcia_add_one); } +#ifndef MODULE static int __init pcmv_setup(char *s) { int v[4]; @@ -158,3 +159,4 @@ static int __init pcmv_setup(char *s) } __setup("pcmv=", pcmv_setup); +#endif _ Patches currently in -mm which might be from arnd@arndb.de are