From patchwork Wed Mar 5 01:21:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 870539 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp553252wrg; Tue, 4 Mar 2025 17:32:55 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXetd8qq8JveSaqILcLTuKB6kS0EBHLEJU2UbMhnmHTERr6s+5wHwMYHovxze5RV7VMCXWj/Q==@linaro.org X-Google-Smtp-Source: AGHT+IFow38LtMVhD8B7ElQdCf64dRJ3tJvyXpmQMfpAiNkSujaGHGXlMkoKhs6dx4uH/xLtL3SM X-Received: by 2002:ac8:5f14:0:b0:474:fbb4:8f7c with SMTP id d75a77b69052e-4750af6f3d6mr25328401cf.11.1741138375427; Tue, 04 Mar 2025 17:32:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741138375; cv=none; d=google.com; s=arc-20240605; b=TtGLFe+3rl8lSCNL4Ax12/H+3gMChcDCD1zwSMnm1pf87PkhpfF2MSR/m/GCbw6vKR 44VIuLF15bEOKRmjWn3JgPaD6ZWyXnaChYkGc8D8tGAlFuL20TrRhxUNBYqurKJws9UT WxNqOeYbmmjGPEjY5mwCl4eO7oOtI37vZzUadeeBQ4tEGowcreeZhOppc9IQH9KHaHiI aDWZw6zp2UfszS+V1NfigGlT0KkLpOU0peymrnW+tJufu81nmgMNucIPOJALBRqs2nO2 b+Bj1vR+JtJ+bm6SAzeqoqiRH+PsJygcWZeTa64+oBuTO2lhC2isLs2ktdrVVXG3oh2H 7V8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=vsB2TZLz8IJAYUss30F4SD873ZK7oobvrmd57J9F3o0=; fh=hrttvYDQ/RHeq9ZPl6fx8GLJN/+EeLQ90pmG86Kf6FU=; b=L1X+LSB76+aaU8I8mTfkN2yS7D56NUMENUGjaZ3yQLHjjuYWZUOCWsYSwjPB2bboOm gOEWs1R5whzSfom1+ky3A8vrblf8KJPp8cJfoWQmMnaM/wPCqbdtWRHU/wSwOelqptHs RQYcussvhj0U8JEcpB3GhjYcBpt2tJFpB/ZLa2RH3Dl2PP0BJP3N2TCCgjftxR+mTHnn /+O/79h4W9dkKd8FHBCsof4IOp400lc6MmXQLjv45e9gafarLnDN3vnZzjOMz5PjU5S/ hPf7Kdw7qMQ2sLFPUrKjDjAyWDpOnmUXZ1IPuHsodfPhIAAZZAW186dPA/qtwiszfwLV STuA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=d9EBc4M7; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-474ee147b39si45769911cf.133.2025.03.04.17.32.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Mar 2025 17:32:55 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=d9EBc4M7; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpdWp-0006IS-1k; Tue, 04 Mar 2025 20:26:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tpdVC-0004Dv-5o for qemu-devel@nongnu.org; Tue, 04 Mar 2025 20:24:51 -0500 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tpdV8-0007I5-Ae for qemu-devel@nongnu.org; Tue, 04 Mar 2025 20:24:48 -0500 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-439a4fc2d65so66719755e9.3 for ; Tue, 04 Mar 2025 17:24:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741137884; x=1741742684; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vsB2TZLz8IJAYUss30F4SD873ZK7oobvrmd57J9F3o0=; b=d9EBc4M7DtdnX5/ouPG6Hv8NEZttA3tFYjeIBH8By2eqq2Ra2oDAacct+xHPxuJBtd rxAXOnw338au/rq7PawSmKqghl+EkOYFfck2CtrXoTnbSgqvaPUUC74qMIE4ZhRc1Xpc 3ejC1PSzJBUn2Grbkk4x2jXYm+9A1/EZJcq/Pr748W+IM/qkhY233cQEYtMLxKm/0CLW AeHg/ewbJ4FHOOg+GSfWQhO64IO8EG5d3711lUhQhdaPH1Rzi10fF6P0LEdIOEsCBXFF yNrLqrCePQZ0/t5C08NzXZUy7Xtpg3Eh1MBwyC1urX5oB0Mkl561tFyZzQv8uMMKynYZ VO0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741137884; x=1741742684; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vsB2TZLz8IJAYUss30F4SD873ZK7oobvrmd57J9F3o0=; b=PI3JXkfEffI5PA6p8xlaHexr5ccfZhUhxRLtPdFAexz33ELG31HCE8ps51XNnKJXej uK0Pq4PArRcSnabZxD47MA8TkKjP44Bf+ZhevL1Bmxs3jGyVXhVulGHy9zwf3LxcGYXA 72UBP1Rg4je9O0XY0MTVMNfbG29EkKYn3wSBH4ilq2M07VTDbAZK4zJVmQGbvvRsX40E VDpHK5K+iZmUKxRBe1CmUe8K2wP2FaIFudkqMWr+swnLk1MIUiUFHXZLdS7o8JLRz0YS e7HsmEHvc7t/Zn3xx4LIjzBfVOiXbUF27NvIlXTUDvLEhEXD6rLMn4ECOnZkqfJIZNCd vlMg== X-Gm-Message-State: AOJu0YyuCaR5hiEVFAvkOFtp5FVIFvbfyYLind+ZtmEjOX7Xc3L/FqI3 1ctyJNU41+Tr5ZZujEVeauahMwUyQ8h+wBsOYZwbM3xJ3PO3gixBIQ0KM0twIsR4OBTmm9/c/7F /BOg= X-Gm-Gg: ASbGnctTi7vBCWiV+Hdwvsja/40HvItJ0sIqF5Dr6a2jsCrLdihGRnHduFGgZJl1Dnt w+Vw+p+aF5g0DaaHwnJ83Ns7552zvxjE7mT7y3EsAHg/U/hQfZZRGqIvIMvTgV7mlsmXS7FRlGQ CF1UuYlJODjBhbhDweTDT8n7xsHR9k6Hg2awaQIDimPqYyFhYsTrbYlabBxlQCQrHf5XfTYiPRi Piz3y6TFXAVa2CKF/DBzqeqqrXVSWro93mO9ZWkOzJ+PVG8peEOsPPbZn0MOn0bjLkFBXzbp3El dKNgyb+6EnsCC9FKy9KRyks0sgjSaKfSxtPfIeig7o2PVOVgH5FyNXboLTgUhj/CMjSwoYgre8L bMiHqWO6mwtYDV0/r19o= X-Received: by 2002:a05:600c:458c:b0:439:9424:1b70 with SMTP id 5b1f17b1804b1-43bd29e0456mr7645145e9.30.1741137884655; Tue, 04 Mar 2025 17:24:44 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43bd42b7478sm2005795e9.17.2025.03.04.17.24.43 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 04 Mar 2025 17:24:44 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Subject: [PULL 34/41] hw/arm/omap1: Drop ALMDEBUG ifdeffed out code Date: Wed, 5 Mar 2025 02:21:49 +0100 Message-ID: <20250305012157.96463-35-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250305012157.96463-1-philmd@linaro.org> References: <20250305012157.96463-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=philmd@linaro.org; helo=mail-wm1-x32d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Peter Maydell In omap1.c, there are some debug printfs in the omap_rtc_write() function that are guardad by ifdef ALMDEBUG. ALMDEBUG is never set, so this is all dead code. It's not worth the effort of converting all of these to tracepoints; a modern tracepoint approach would probably have a single tracepoint covering all the register writes anyway. Just delete the printf()s. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Message-ID: <20250227170117.1726895-3-peter.maydell@linaro.org> Signed-off-by: Philippe Mathieu-Daudé --- hw/arm/omap1.c | 51 -------------------------------------------------- 1 file changed, 51 deletions(-) diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c index 3c0ce5e0979..8f5bb81c96a 100644 --- a/hw/arm/omap1.c +++ b/hw/arm/omap1.c @@ -2660,25 +2660,16 @@ static void omap_rtc_write(void *opaque, hwaddr addr, switch (offset) { case 0x00: /* SECONDS_REG */ -#ifdef ALMDEBUG - printf("RTC SEC_REG <-- %02x\n", value); -#endif s->ti -= s->current_tm.tm_sec; s->ti += from_bcd(value); return; case 0x04: /* MINUTES_REG */ -#ifdef ALMDEBUG - printf("RTC MIN_REG <-- %02x\n", value); -#endif s->ti -= s->current_tm.tm_min * 60; s->ti += from_bcd(value) * 60; return; case 0x08: /* HOURS_REG */ -#ifdef ALMDEBUG - printf("RTC HRS_REG <-- %02x\n", value); -#endif s->ti -= s->current_tm.tm_hour * 3600; if (s->pm_am) { s->ti += (from_bcd(value & 0x3f) & 12) * 3600; @@ -2688,17 +2679,11 @@ static void omap_rtc_write(void *opaque, hwaddr addr, return; case 0x0c: /* DAYS_REG */ -#ifdef ALMDEBUG - printf("RTC DAY_REG <-- %02x\n", value); -#endif s->ti -= s->current_tm.tm_mday * 86400; s->ti += from_bcd(value) * 86400; return; case 0x10: /* MONTHS_REG */ -#ifdef ALMDEBUG - printf("RTC MTH_REG <-- %02x\n", value); -#endif memcpy(&new_tm, &s->current_tm, sizeof(new_tm)); new_tm.tm_mon = from_bcd(value); ti[0] = mktimegm(&s->current_tm); @@ -2715,9 +2700,6 @@ static void omap_rtc_write(void *opaque, hwaddr addr, return; case 0x14: /* YEARS_REG */ -#ifdef ALMDEBUG - printf("RTC YRS_REG <-- %02x\n", value); -#endif memcpy(&new_tm, &s->current_tm, sizeof(new_tm)); new_tm.tm_year += from_bcd(value) - (new_tm.tm_year % 100); ti[0] = mktimegm(&s->current_tm); @@ -2737,25 +2719,16 @@ static void omap_rtc_write(void *opaque, hwaddr addr, return; /* Ignored */ case 0x20: /* ALARM_SECONDS_REG */ -#ifdef ALMDEBUG - printf("ALM SEC_REG <-- %02x\n", value); -#endif s->alarm_tm.tm_sec = from_bcd(value); omap_rtc_alarm_update(s); return; case 0x24: /* ALARM_MINUTES_REG */ -#ifdef ALMDEBUG - printf("ALM MIN_REG <-- %02x\n", value); -#endif s->alarm_tm.tm_min = from_bcd(value); omap_rtc_alarm_update(s); return; case 0x28: /* ALARM_HOURS_REG */ -#ifdef ALMDEBUG - printf("ALM HRS_REG <-- %02x\n", value); -#endif if (s->pm_am) s->alarm_tm.tm_hour = ((from_bcd(value & 0x3f)) % 12) + @@ -2766,33 +2739,21 @@ static void omap_rtc_write(void *opaque, hwaddr addr, return; case 0x2c: /* ALARM_DAYS_REG */ -#ifdef ALMDEBUG - printf("ALM DAY_REG <-- %02x\n", value); -#endif s->alarm_tm.tm_mday = from_bcd(value); omap_rtc_alarm_update(s); return; case 0x30: /* ALARM_MONTHS_REG */ -#ifdef ALMDEBUG - printf("ALM MON_REG <-- %02x\n", value); -#endif s->alarm_tm.tm_mon = from_bcd(value); omap_rtc_alarm_update(s); return; case 0x34: /* ALARM_YEARS_REG */ -#ifdef ALMDEBUG - printf("ALM YRS_REG <-- %02x\n", value); -#endif s->alarm_tm.tm_year = from_bcd(value); omap_rtc_alarm_update(s); return; case 0x40: /* RTC_CTRL_REG */ -#ifdef ALMDEBUG - printf("RTC CONTROL <-- %02x\n", value); -#endif s->pm_am = (value >> 3) & 1; s->auto_comp = (value >> 2) & 1; s->round = (value >> 1) & 1; @@ -2802,32 +2763,20 @@ static void omap_rtc_write(void *opaque, hwaddr addr, return; case 0x44: /* RTC_STATUS_REG */ -#ifdef ALMDEBUG - printf("RTC STATUSL <-- %02x\n", value); -#endif s->status &= ~((value & 0xc0) ^ 0x80); omap_rtc_interrupts_update(s); return; case 0x48: /* RTC_INTERRUPTS_REG */ -#ifdef ALMDEBUG - printf("RTC INTRS <-- %02x\n", value); -#endif s->interrupts = value; return; case 0x4c: /* RTC_COMP_LSB_REG */ -#ifdef ALMDEBUG - printf("RTC COMPLSB <-- %02x\n", value); -#endif s->comp_reg &= 0xff00; s->comp_reg |= 0x00ff & value; return; case 0x50: /* RTC_COMP_MSB_REG */ -#ifdef ALMDEBUG - printf("RTC COMPMSB <-- %02x\n", value); -#endif s->comp_reg &= 0x00ff; s->comp_reg |= 0xff00 & (value << 8); return;