From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 201093A875F for ; Wed, 29 Jul 2026 22:52:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.54 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785365525; cv=none; b=U7TA46R5k4MuV7G9fikccWmQXLLYJEATTbQ/YZYBkWGMqeqVi1mPqmE5OSjKTCcrhMZND17YlHKU77vmPdYa7pHx6qMtBJP3DxPp/USiDOBUIAwZq2yyBn8Sarvi28WNdYsegv4ziuO8cQLeyZkhfqBbyDJZ3ULHrWGLr2yQPHU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785365525; c=relaxed/simple; bh=ASpKDerMW5kqehvGMv2OZhWmr6QNCaKZJSuku7fWJAg=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=NukabT4F3TI59OLlgaOXNPfHcRGRygS7f/dBomEMaVz4AP1SWKJkz0MDN8k4ruGitlbBwghTZciv/tlsLHJWDCKHCC4WZe9kVndfXrZF7J4Z5rJYadf8P2QRyDJ84wHCHX1uOMIkbUw8l3UPz8UTux04tFngY8hqs7Ia6wy4r6w= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=AG4bdx/D; arc=none smtp.client-ip=209.85.216.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="AG4bdx/D" Received: by mail-pj1-f54.google.com with SMTP id 98e67ed59e1d1-38f0f132f56so138081a91.0 for ; Wed, 29 Jul 2026 15:52:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785365523; x=1785970323; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=WLq+7wmGJnDVqRzy/9WiaGXniOfQxglk1F1iJbCO8zQ=; b=AG4bdx/DMuAIt/uJ2NcMn5HrKR9xWUyCLVmQuthnY2hAWezV+tYCwu94d0XFImVsSX jLlBKx03wl+1zIcb4n8pt/pceNMWTZUotgGg09JdQnJ6pQ0Xv52NXJ6fon8+B/h4Qwjq M/32HM2H40S/+VH45vu4r4Xa3s5/w7twnmLGuRZwiWYiXui83VVC0I4MMc6cDbpYnUJt JC9nI8To3TdyZ1gUblemuPSbQQxRHDMZ0yCbhDHc986sSturxS79DwIhb96jFjKf5asq TFY+MmhTF8Qn96LwqkD6D0VDaw0N1qoBz4XEht+yEmHI93+E1pLp3yznO3CfxeO0AYgO wcOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785365523; x=1785970323; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=WLq+7wmGJnDVqRzy/9WiaGXniOfQxglk1F1iJbCO8zQ=; b=UQB7O/7VurfUIxZknErWFfPVIjqUkT+4VCQFymH/hoLUc9DSfX23WKk+CN7JGYQI18 JfCoJo0Nni+2gDg5Htct0ddCHRtQz7H1525U7rDw4FpNOFtCRD/zsmj4umtS4A4SyKYs rBLdQ1JttoEf8GrtXBvzxNJaxdX3Kt8OiwAUHnsM9g22Ty+J0VWj3BcuBD7zzLqN10T7 Iflm0gO3zbah9XMXwIUqHefQw5Yu3vvZDqsHpUukGrqCEpKpOjKpmhwYNqCA7KDFVvUG FwqkBlRKhSakBh7bzIdFO0GWkK2gvCiBtQPLvziniM01lEs6r7KZlbtWmaeBsy3lm2Dw PeMA== X-Forwarded-Encrypted: i=1; AHgh+RqLowlGHNF4iNKmcB6XRAFeBGc6rdKATJcTdRirbzuPSdH2BjfSrX7ogz03mzmaPhy0qrQSZmTKZE+IFq4=@vger.kernel.org X-Gm-Message-State: AOJu0Yyowtnn6EWivLaKmITMTAzIC+1ORYjUe1cYoxDUbT1rQylTQM0Z ZZF+7t9p5eWv1qOtzfoDmbVONnzmvmKLs6ZXvUNWIIdm8wkU4rLMmWrU X-Gm-Gg: AR+sD11J7eF07iqJPHZv9Tj0b62SFVZlDfaO5pe4PqhkMXAumvvwZwP5vaUhQj8ON0j ra2CSipNsZC9/zKtWmf54jBc6NwQ1lbCTc0nuneHP9XrS+P0WjNOG60FPUqdFIoUND6+KARxzx/ z655UL1e8zOmZusOLgpzjfxWN5ODn7gg05p3cutB0N6XfQ/juMNRn46B1SJYgSPzDT1qUl7MfxT hVZ5b6ggn3uhLGUOS6LxH78c6JHlfSyumvY3qJT0VOwel425lomuKsU51lBW66lkHQgNxdv0RZh fceUQXrIsz5Y+PKwLTzJNsYg5TFRYuCMsaDzKlKGDyRw1kMnZ0LtGKZtRbR6j13FG6X1Ff2z0RN KN02Mu6PFX+Yg5xBUk00Q9CYMsw4xKJfyxejKTVXMQawnGngTfiobmzXJAkxbU3syPJMd93/Wa4 pUwSRcy/LWHgbLqCzQfJLyz4akoNwS2QppDGIc3j27atrXPdVjnVWHoNFa+20plkMXIvpI+LPAj ImhtltWLHokhnMKItINlqxIL+YBXDTxAoJZDTiXaldefe1dKKLssoDS8Ra4M63iuXLa30mI/Ru5 +HSO0NKzYiyQ7uQ9+2wwwXAPsSd+rjVPlTQ8jw== X-Received: by 2002:a17:90b:39a6:b0:38e:5828:a446 with SMTP id 98e67ed59e1d1-38f9bb8b861mr157860a91.19.1785365523272; Wed, 29 Jul 2026 15:52:03 -0700 (PDT) Received: from ryzen.lan ([2601:644:8000:7a86::e35]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-38f9b770e3esm58567a91.0.2026.07.29.15.52.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jul 2026 15:52:02 -0700 (PDT) From: Rosen Penev To: linux-rtc@vger.kernel.org Cc: Alexandre Belloni , Maxime Coquelin , Alexandre Torgue , linux-stm32@st-md-mailman.stormreply.com (moderated list:ARM/STM32 ARCHITECTURE), linux-arm-kernel@lists.infradead.org (moderated list:ARM/STM32 ARCHITECTURE), linux-kernel@vger.kernel.org (open list) Subject: [PATCHv3] rtc: stmp3xxx: use devm_platform_ioremap_resource() Date: Wed, 29 Jul 2026 15:51:59 -0700 Message-ID: <20260729225159.775183-1-rosenp@gmail.com> X-Mailer: git-send-email 2.55.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Replace the open-coded platform_get_resource() plus devm_ioremap() sequence with a single devm_platform_ioremap_resource() call, which folds the resource lookup and mapping into one step and returns an ERR_PTR on failure, checked with IS_ERR() and propagated via PTR_ERR(). Move the mapping ahead of the devm_kzalloc() so that an error or deferred probe is handled before the rtc_data allocation, avoiding needless work. The fsl,stmp3xxx-rtc nodes in imx23.dtsi (reg = <0x8005c000 0x2000>) and imx28.dtsi (reg = <0x80056000 0x2000>) each provide a single non-overlapping IORESOURCE_MEM window, so the region reservation now performed by devm_platform_ioremap_resource() introduces no conflict. Remove irq_alarm from private struct. It's only used in _probe. Also add check for platform_get_irq() errors. Assisted-by: opencode:hy3-free Signed-off-by: Rosen Penev --- v3: add missing variable in probe v2: add platform_get_irq error check drivers/rtc/rtc-stmp3xxx.c | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/drivers/rtc/rtc-stmp3xxx.c b/drivers/rtc/rtc-stmp3xxx.c index 7afcd14aeee5..a8ca681b574f 100644 --- a/drivers/rtc/rtc-stmp3xxx.c +++ b/drivers/rtc/rtc-stmp3xxx.c @@ -56,7 +56,6 @@ struct stmp3xxx_rtc_data { struct rtc_device *rtc; void __iomem *io; - int irq_alarm; }; #if IS_ENABLED(CONFIG_STMP3XXX_RTC_WATCHDOG) @@ -245,29 +244,26 @@ static void stmp3xxx_rtc_remove(struct platform_device *pdev) static int stmp3xxx_rtc_probe(struct platform_device *pdev) { struct stmp3xxx_rtc_data *rtc_data; - struct resource *r; + void __iomem *io; u32 rtc_stat; u32 pers0_set, pers0_clr; u32 crystalfreq = 0; + int irq_alarm; int err; + irq_alarm = platform_get_irq(pdev, 0); + if (irq_alarm < 0) + return irq_alarm; + + io = devm_platform_ioremap_resource(pdev, 0); + if (IS_ERR(io)) + return PTR_ERR(io); + rtc_data = devm_kzalloc(&pdev->dev, sizeof(*rtc_data), GFP_KERNEL); if (!rtc_data) return -ENOMEM; - r = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!r) { - dev_err(&pdev->dev, "failed to get resource\n"); - return -ENXIO; - } - - rtc_data->io = devm_ioremap(&pdev->dev, r->start, resource_size(r)); - if (!rtc_data->io) { - dev_err(&pdev->dev, "ioremap failed\n"); - return -EIO; - } - - rtc_data->irq_alarm = platform_get_irq(pdev, 0); + rtc_data->io = io; rtc_stat = readl(rtc_data->io + STMP3XXX_RTC_STAT); if (!(rtc_stat & STMP3XXX_RTC_STAT_RTC_PRESENT)) { @@ -354,13 +350,10 @@ static int stmp3xxx_rtc_probe(struct platform_device *pdev) if (IS_ERR(rtc_data->rtc)) return PTR_ERR(rtc_data->rtc); - err = devm_request_irq(&pdev->dev, rtc_data->irq_alarm, + err = devm_request_irq(&pdev->dev, irq_alarm, stmp3xxx_rtc_interrupt, 0, "RTC alarm", &pdev->dev); - if (err) { - dev_err(&pdev->dev, "Cannot claim IRQ%d\n", - rtc_data->irq_alarm); + if (err) return err; - } rtc_data->rtc->ops = &stmp3xxx_rtc_ops; rtc_data->rtc->range_max = U32_MAX; -- 2.55.0