From patchwork Sun Jun 20 00:42:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 1494715 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; dkim=pass (2048-bit key; secure) header.d=linutronix.de header.i=@linutronix.de header.a=rsa-sha256 header.s=2020 header.b=4FR15Q4/; dkim=pass header.d=linutronix.de header.i=@linutronix.de header.a=ed25519-sha256 header.s=2020e header.b=j+xeBocK; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4G6v5H4gmqz9sRf for ; Sun, 20 Jun 2021 10:42:43 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229673AbhFTAox (ORCPT ); Sat, 19 Jun 2021 20:44:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43556 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229591AbhFTAow (ORCPT ); Sat, 19 Jun 2021 20:44:52 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 04AB5C061574 for ; Sat, 19 Jun 2021 17:42:41 -0700 (PDT) From: Thomas Gleixner DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1624149759; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type; bh=xK+DmaXnoyosriDPMF/7746cVAw94Vag+mYBs6UPJGo=; b=4FR15Q4/JQeepp9r2nY+XdAnjiQnjTT+B2pPEn/fXAkwgmbwVglJeTiIWSa4p3p3xMYAwE FPnsipcJVxHeKubHxxaCc9OzKlOQ9ZYTxs0vSWd/1HRzNQvyISfPdoqj1ciYRtr635DNRM rXVH4i85Yok6vQlHDhVqb3khnlreFrqMyrW8t6NNK2zvReCJ9Mn8XRXOLPU/DEP9qO/iyv rJTxbfg8pxFxIRaxDymcw9j0TL9RQDv2Hzh9sEGKjF+1HHeEUybMhoAJI5IO4fcpeBKlJ4 nq9hFYQpuY4RoZGdaokRwIUsYu3b8unGFUyGoWGEzHUSjZo5Vmu8XpobzW/zDg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1624149759; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type; bh=xK+DmaXnoyosriDPMF/7746cVAw94Vag+mYBs6UPJGo=; b=j+xeBocKCsRLfHfdR93MsIyYMQ3bverm5Qyzs2HJajTMFCjnI4dD3Spvo33VGRSTwv1Roc W2No9q7fStWhPbDQ== To: linux-rtc@vger.kernel.org Cc: Alessandro Zummo , Alexandre Belloni Subject: rtc: pcf8523: Rename REG_OFFSET Date: Sun, 20 Jun 2021 02:42:39 +0200 Message-ID: <8735tdgydc.ffs@nanos.tec.linutronix.de> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-rtc@vger.kernel.org Moving ARM to the generic irqstat infrastructure caused arch/arm/mach-ixp4xx/include/mach/platform.h to be included indirectly in interrupt related headers, which results in a build failure: >> drivers/rtc/rtc-pcf8523.c:35: warning: "REG_OFFSET" redefined 35 | #define REG_OFFSET 0x0e Rename it to PCF_REG_OFFSET and for consistency the mode define to PCF_REG_OFFSET_MODE. Fixes: 7fd70c65faac ("ARM: irqstat: Get rid of duplicated declaration") Reported-by: kernel test robot Signed-off-by: Thomas Gleixner Cc: Alessandro Zummo Cc: Alexandre Belloni Cc: linux-rtc@vger.kernel.org --- drivers/rtc/rtc-pcf8523.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) --- a/drivers/rtc/rtc-pcf8523.c +++ b/drivers/rtc/rtc-pcf8523.c @@ -41,8 +41,8 @@ #define REG_WEEKDAY_ALARM 0x0d #define ALARM_DIS BIT(7) -#define REG_OFFSET 0x0e -#define REG_OFFSET_MODE BIT(7) +#define PCF_REG_OFFSET 0x0e +#define PCF_REG_OFFSET_MODE BIT(7) #define REG_TMR_CLKOUT_CTRL 0x0f @@ -442,13 +442,13 @@ static int pcf8523_rtc_read_offset(struc u8 value; s8 val; - err = pcf8523_read(client, REG_OFFSET, &value); + err = pcf8523_read(client, PCF_REG_OFFSET, &value); if (err < 0) return err; /* sign extend the 7-bit offset value */ val = value << 1; - *offset = (value & REG_OFFSET_MODE ? 4069 : 4340) * (val >> 1); + *offset = (value & PCF_REG_OFFSET_MODE ? 4069 : 4340) * (val >> 1); return 0; } @@ -465,9 +465,9 @@ static int pcf8523_rtc_set_offset(struct if (abs(reg_m0 * 4340 - offset) < abs(reg_m1 * 4069 - offset)) value = reg_m0 & 0x7f; else - value = (reg_m1 & 0x7f) | REG_OFFSET_MODE; + value = (reg_m1 & 0x7f) | PCF_REG_OFFSET_MODE; - return pcf8523_write(client, REG_OFFSET, value); + return pcf8523_write(client, PCF_REG_OFFSET, value); } static const struct rtc_class_ops pcf8523_rtc_ops = {