From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 51851606A31A for ; Sat, 31 Oct 2026 07:04:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key, unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=UWBZkRp7 Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1xN35d-0007EI-OW; Sat, 31 Oct 2026 03:01:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1xN34B-0003KK-8j for qemu-devel@nongnu.org; Sat, 31 Oct 2026 02:59:54 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1xN349-0002yD-By for qemu-devel@nongnu.org; Sat, 31 Oct 2026 02:59:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1793429986; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DwoDm/HmoJy6i9sWt7c51FmK+ZXVyS/7ZLqX8p5T9OM=; b=UWBZkRp7nfwLLsEpOZwOzPIcaMjH46Olri1SzOfxYTG6RmHtqTZ93hjFAedc5w1i4QBXIG GE8Oc491hXAttQlGGPBR4sFuwvhjfcvzvD9xGtBRDXudACriMR2hqKoYtwYK5oaTs9h1bV 1RrFifD0LwQeqe4HxpeYTZdwOhcYz5w= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-516-pkdBd9dNPHOrRcX2VVZGqw-1; Sat, 31 Oct 2026 02:59:42 -0400 X-MC-Unique: pkdBd9dNPHOrRcX2VVZGqw-1 X-Mimecast-MFC-AGG-ID: pkdBd9dNPHOrRcX2VVZGqw_1793429981 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 92A631956044; Sat, 31 Oct 2026 06:59:41 +0000 (UTC) Received: from circe.redhat.com (unknown [10.44.32.2]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 01FFF1800677; Sat, 31 Oct 2026 06:59:39 +0000 (UTC) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Cc: Emmanuel Blot , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Subject: [PULL 33/34] hw/rtc: ds1338: prefix the file-local helpers with ds1338_ Date: Sat, 31 Oct 2026 07:58:22 +0100 Message-ID: <20261031065823.191966-34-clg@redhat.com> In-Reply-To: <20261031065823.191966-1-clg@redhat.com> References: <20261031065823.191966-1-clg@redhat.com> X-Archived-By: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 Received-SPF: pass client-ip=170.10.133.124; envelope-from=clg@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 5 X-Spam_score: 0.5 X-Spam_bar: / X-Spam_report: (0.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_PASS, SPF_PASS autolearn=ham autolearn_force=no version=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on aws-us-west-2-korg-listserv-alma10-1 From: Emmanuel Blot Two static helpers predate the rest of the file and carry no device prefix. Reviewed-by: Cédric Le Goater Signed-off-by: Emmanuel Blot Link: https://lore.kernel.org/qemu-devel/20261015-bmc-minerva-v3-11-7d50c8a108e5@free.fr Signed-off-by: Cédric Le Goater --- hw/rtc/ds1338.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/rtc/ds1338.c b/hw/rtc/ds1338.c index 74aee6c74633..1755a3a37c1d 100644 --- a/hw/rtc/ds1338.c +++ b/hw/rtc/ds1338.c @@ -57,7 +57,7 @@ static const VMStateDescription vmstate_ds1338 = { } }; -static void capture_current_time(DS1338State *s) +static void ds1338_capture_current_time(DS1338State *s) { /* Capture the current time into the secondary registers * which will be actually read by the data transfer operation. @@ -85,7 +85,7 @@ static void capture_current_time(DS1338State *s) s->nvram[6] = to_bcd(now.tm_year - 100); } -static void inc_regptr(DS1338State *s) +static void ds1338_inc_regptr(DS1338State *s) { /* The register pointer wraps around after 0x3F; wraparound * causes the current time/date to be retransferred into @@ -93,7 +93,7 @@ static void inc_regptr(DS1338State *s) */ s->ptr = (s->ptr + 1) & (NVRAM_SIZE - 1); if (!s->ptr) { - capture_current_time(s); + ds1338_capture_current_time(s); } } @@ -108,7 +108,7 @@ static int ds1338_event(I2CSlave *i2c, enum i2c_event event) * START_SEND, because the guest can't get at that data * without going through a START_RECV which would overwrite it. */ - capture_current_time(s); + ds1338_capture_current_time(s); break; case I2C_START_SEND: s->addr_byte = true; @@ -129,7 +129,7 @@ static uint8_t ds1338_recv(I2CSlave *i2c) trace_ds1338_recv(s->ptr, res); - inc_regptr(s); + ds1338_inc_regptr(s); return res; } @@ -204,7 +204,7 @@ static int ds1338_send(I2CSlave *i2c, uint8_t data) } else { s->nvram[s->ptr] = data; } - inc_regptr(s); + ds1338_inc_regptr(s); return 0; } -- 2.56.0