From patchwork Wed Dec 30 14:59:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 1421376 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-rtc-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=r1eaIpye; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4D5ZGb60xRz9sVb for ; Thu, 31 Dec 2020 02:00:39 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726333AbgL3PAX (ORCPT ); Wed, 30 Dec 2020 10:00:23 -0500 Received: from mail.kernel.org ([198.145.29.99]:39992 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726462AbgL3PAX (ORCPT ); Wed, 30 Dec 2020 10:00:23 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 45FC321973; Wed, 30 Dec 2020 14:59:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1609340382; bh=8Tm4+r/3ULTX6/AYNnKQLnmE6Ug4OE8sLY/1YXNk9Fo=; h=From:To:Cc:Subject:Date:From; b=r1eaIpye85I9oYl9j4jcg5w1PG2Pq5vaLmQWyP76febiteJEr/N8UDXZk42xQlk0/ fba+VfZ07fQQdPLuupJeCkuguA7LfpXzunIsozVhemt2GhrbIn8QR5KSVc1fYx+PnV irZCc1VTA8kTGfFSWh3eydpVCb4hXuInETjWvUCDOLksW6kGYVT5t4yleJDwH9HmyG OBjueBpEAHnlAkCoV7IUU+27u+omtHzDIdjrrzXIW5XT9OsOoKMmAFFYDhkpKZKsX5 LZJQPTbgA7X8M7WmK7P9mgzR6xI0bFzKjrUEZrVXZTDpftLVMYGC0V7TwcobKI/wnd hmbbGRElHGLZw== From: Arnd Bergmann To: Alessandro Zummo , Alexandre Belloni , Henning Schild , Claudius Heine Cc: Arnd Bergmann , linux-rtc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] rtc: rx6110: fix build against modular I2C Date: Wed, 30 Dec 2020 15:59:11 +0100 Message-Id: <20201230145938.3254459-1-arnd@kernel.org> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-rtc@vger.kernel.org From: Arnd Bergmann With CONFIG_I2C=m, the #ifdef section is disabled, as shown by this warning: drivers/rtc/rtc-rx6110.c:314:12: error: unused function 'rx6110_probe' [-Werror,-Wunused-function] Change the driver to use IS_ENABLED() instead, which works for both module and built-in subsystems. Fixes: afa819c2c6bf ("rtc: rx6110: add i2c support") Signed-off-by: Arnd Bergmann --- drivers/rtc/rtc-rx6110.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/rtc/rtc-rx6110.c b/drivers/rtc/rtc-rx6110.c index a7b671a21022..79161d4c6ce4 100644 --- a/drivers/rtc/rtc-rx6110.c +++ b/drivers/rtc/rtc-rx6110.c @@ -331,7 +331,7 @@ static int rx6110_probe(struct rx6110_data *rx6110, struct device *dev) return 0; } -#ifdef CONFIG_SPI_MASTER +#if IS_ENABLED(CONFIG_SPI_MASTER) static struct regmap_config regmap_spi_config = { .reg_bits = 8, .val_bits = 8, @@ -411,7 +411,7 @@ static void rx6110_spi_unregister(void) } #endif /* CONFIG_SPI_MASTER */ -#ifdef CONFIG_I2C +#if IS_ENABLED(CONFIG_I2C) static struct regmap_config regmap_i2c_config = { .reg_bits = 8, .val_bits = 8,