From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pz2-f1.google.com (mail-pz2-f1.google.com [74.125.228.1]) (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 6B5A7440650 for ; Thu, 20 Aug 2026 08:08:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.228.1 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787213286; cv=none; b=EoLPaQz/Y4JybynP7yGDbBaWkIRf+A2pV87k7UGC4ZUiVjwZuMswOQN3CcB9a6LGzwDJGdaLNy/qnzlAnrE7URb6+RTQdp+5MVU41KwBmW+C8oskMSPEUjAi5RsIzCFdvadGbtuLk2QEbV1soJPGGjqXTSecr3Bn7XZxEYubjyo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787213286; c=relaxed/simple; bh=JrSxGhiY9YbKE0r8geHI6lykiTiWPRu/almUpFLxeiI=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=aetBXnYKXUnyf67+0iYQXqncwWxWT1kYjBIJ22PDdqzuO/HBaU63Odk+TCuXYi8QHc9Vwv6EqvXb5UkDD4k0HJ464omulE8d4oYY1ma/S0YHkIscXbtyuv73hnxm6hLyUvrdJUITEdogab78y1mb2C7oQIS5vSCZulZnxKk+qYk= 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=Vt/VFim2; arc=none smtp.client-ip=74.125.228.1 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="Vt/VFim2" Received: by mail-pz2-f1.google.com with SMTP id 41be03b00d2f7-cbb8ebaca74so776379a12.1 for ; Thu, 20 Aug 2026 01:08:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1787213284; x=1787818084; 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=OWXb8OfrIhx+v+9x1/zpkXJrGwA1aKR+aC1z4e+KOx8=; b=Vt/VFim20Zhh75WSHsN8tu3iVgwawDYumdoMhJa32927td8WzymSMFl924bRj9SPB3 EEfupEVKVYWp2JRutIKnGsiTsoZLWmIs+IXnW9yztSSx471RE/Vi9gH6VXkAbualDCY5 Pnvs4D785/e4kizkudtUqpzCbPD/PDhl1ZhtPWVFNGbyOjN1W0NwVRdXtsBj38uQrkzG K2Hg5nFb5T6x9hOjfazcVm+o5bHXrDT1AuCzqQqAwAPQyA5V5V7A0vXyjKlw+xqViWmh 9KsQOQ7bQTPTC8WZATjmiyEgF8Tc1E9WsJETmoMQQXWLRHuvZTcN4hueclJQWJhQPG51 HcZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787213284; x=1787818084; 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=OWXb8OfrIhx+v+9x1/zpkXJrGwA1aKR+aC1z4e+KOx8=; b=S+/rnNN6G1V+ccURWpGz8AH/v1hVHYEcOMQwn10t/RPr6VaOiQZR88LMwMnohdl0Ro 8lr+ttGqeAXfgLSKxJl1CB95fU41+vG+zmpg9QFNWyi28W3wH62uMZUdNGLz8Mmqk6Bd njUP+ec7gF3j9lMnqyTEzThRyU4ibpjIcL2iWm9Rj2V3sY5u1hFjNg7xAeMkVXLOzIP/ VrKrTw48MtDqIR/qioF1/AWfQhj87+wCmKGLTUqajTWung8xNrcS4s+h4MkHilgfrvUg cosdJ/5PGAPkz7xQ2vx9Ewl1h85Izg7XPJtpMTCM5+RLqqsv0YnZqhhNkqtGbNktOwwE kU3g== X-Forwarded-Encrypted: i=1; AHgh+RqpPPOFrMEVimPiO+7q/7lVR7jA1Lh8ZLsReUEjcDc4ZBoHdniEmyHaAnxCQT6co4iEIdS2YxfYeIC7rdU=@vger.kernel.org X-Gm-Message-State: AOJu0Yw4U4kxkh88b/OwkD1gk+txSxZRZnSpx0xNwq+lv3V5N4ogIS6S zrwH9zCXeOCbHTRDuMLfKkPf/SenG9XYOD/ObCYIZx0aiFlqm3h6AKtn X-Gm-Gg: AR+sD100OKHMqXlXo5lISiNg8nCH7bFU8se0BHs1+74O6ILvlyNdLVZOn4RbB0lrWaq /xVSPUaxjpVnwVU6NK76h/F+sGejckPTA1L2OEmZLxaNE6hnRa8tN8LWASPIa9/ZNHmL1HBDUFi /D/nPu2TyicVlWPPaPxGlSifVT2rQzUmm80uGYcnRu9Hx2yK4c8HWN+h1xLxi5+imrkQPAF2zx0 a+4cuwpAydL3l7/WShKsmjighSSc0c8mY/JqXDU90yWQRbi5YZCia7eph/O3aJ/MyYpA2h+++yf CRHP/9chLcYzXu5sMyrReWurVP2TzW3Q/n9YyYoRyAe48MdWqN/dJhbF+u+nkt22UbnlcCf/8Cn 2AlWVi+dQo8eARs9HoV+ifQjfkbjtvBfDoJsbwF9k2jjavtzSfkyOaC/FHDXKyEYBIoP+e/u7tl wrCDZcOR+yuenG/KOAx/nzDh7oU5Zcz9D8gpd8eobBPGKGhpc//o+3LLPZk8ghpA== X-Received: by 2002:a05:6a00:190e:b0:842:708f:39be with SMTP id d2e1a72fcca58-851d382dc95mr16866958b3a.5.1787213284160; Thu, 20 Aug 2026 01:08:04 -0700 (PDT) Received: from work-hw ([223.214.148.187]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-851d3617375sm1393419b3a.36.2026.08.20.01.08.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Aug 2026 01:08:03 -0700 (PDT) From: KrisPoint X-Google-Original-From: KrisPoint To: gregkh@linuxfoundation.org, rafael@kernel.org, dakr@kernel.org Cc: driver-core@lists.linux.dev, linux-kernel@vger.kernel.org, KrisPoint Subject: [PATCH] platform: unify the platform_pm_* suspend/resume dispatch Date: Thu, 20 Aug 2026 16:07:35 +0800 Message-ID: <20260820080735.691297-1-KrisPointCSGO@gmail.com> X-Mailer: git-send-email 2.53.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 The six platform_pm_suspend()/platform_pm_resume()/platform_pm_freeze()/ platform_pm_thaw()/platform_pm_poweroff()/platform_pm_restore() callbacks all follow the same pattern: return early when the device has no driver, call the matching dev_pm_ops callback when one is present, and otherwise fall back to the legacy platform suspend/resume callbacks. This skeleton is currently open-coded in each of the six functions, leaving about 110 lines of near-identical logic that must be kept in sync by hand. Add a common platform_pm_dispatch() helper that implements the shared logic, driven by the dev_pm_ops callback, the legacy callback and the pm message to pass, and turn the six callbacks into thin wrappers around it. A platform_legacy_resume_state() adapter is added so the legacy callbacks share a single signature. No functional change intended. Signed-off-by: KrisPoint --- drivers/base/platform.c | 109 ++++++++++++++-------------------------- 1 file changed, 38 insertions(+), 71 deletions(-) diff --git a/drivers/base/platform.c b/drivers/base/platform.c index 66f9ec73d..f02b44937 100644 --- a/drivers/base/platform.c +++ b/drivers/base/platform.c @@ -1248,44 +1248,47 @@ static int platform_legacy_resume(struct device *dev) return ret; } -#endif /* CONFIG_PM_SLEEP */ - -#ifdef CONFIG_SUSPEND +static int platform_legacy_resume_state(struct device *dev, pm_message_t state) +{ + return platform_legacy_resume(dev); +} -int platform_pm_suspend(struct device *dev) +static int platform_pm_dispatch(struct device *dev, + int (*pm_op)(struct device *), + int (*legacy_op)(struct device *, pm_message_t), + pm_message_t legacy_state) { const struct device_driver *drv = dev->driver; - int ret = 0; if (!drv) return 0; - if (drv->pm) { - if (drv->pm->suspend) - ret = drv->pm->suspend(dev); - } else { - ret = platform_legacy_suspend(dev, PMSG_SUSPEND); - } + if (drv->pm) + return pm_op ? pm_op(dev) : 0; - return ret; + return legacy_op(dev, legacy_state); } -int platform_pm_resume(struct device *dev) +#endif /* CONFIG_PM_SLEEP */ + +#ifdef CONFIG_SUSPEND + +int platform_pm_suspend(struct device *dev) { const struct device_driver *drv = dev->driver; - int ret = 0; - if (!drv) - return 0; + return platform_pm_dispatch(dev, + drv && drv->pm ? drv->pm->suspend : NULL, + platform_legacy_suspend, PMSG_SUSPEND); +} - if (drv->pm) { - if (drv->pm->resume) - ret = drv->pm->resume(dev); - } else { - ret = platform_legacy_resume(dev); - } +int platform_pm_resume(struct device *dev) +{ + const struct device_driver *drv = dev->driver; - return ret; + return platform_pm_dispatch(dev, + drv && drv->pm ? drv->pm->resume : NULL, + platform_legacy_resume_state, PMSG_RESUME); } #endif /* CONFIG_SUSPEND */ @@ -1295,73 +1298,37 @@ int platform_pm_resume(struct device *dev) int platform_pm_freeze(struct device *dev) { const struct device_driver *drv = dev->driver; - int ret = 0; - - if (!drv) - return 0; - - if (drv->pm) { - if (drv->pm->freeze) - ret = drv->pm->freeze(dev); - } else { - ret = platform_legacy_suspend(dev, PMSG_FREEZE); - } - return ret; + return platform_pm_dispatch(dev, + drv && drv->pm ? drv->pm->freeze : NULL, + platform_legacy_suspend, PMSG_FREEZE); } int platform_pm_thaw(struct device *dev) { const struct device_driver *drv = dev->driver; - int ret = 0; - if (!drv) - return 0; - - if (drv->pm) { - if (drv->pm->thaw) - ret = drv->pm->thaw(dev); - } else { - ret = platform_legacy_resume(dev); - } - - return ret; + return platform_pm_dispatch(dev, + drv && drv->pm ? drv->pm->thaw : NULL, + platform_legacy_resume_state, PMSG_RESUME); } int platform_pm_poweroff(struct device *dev) { const struct device_driver *drv = dev->driver; - int ret = 0; - if (!drv) - return 0; - - if (drv->pm) { - if (drv->pm->poweroff) - ret = drv->pm->poweroff(dev); - } else { - ret = platform_legacy_suspend(dev, PMSG_HIBERNATE); - } - - return ret; + return platform_pm_dispatch(dev, + drv && drv->pm ? drv->pm->poweroff : NULL, + platform_legacy_suspend, PMSG_HIBERNATE); } int platform_pm_restore(struct device *dev) { const struct device_driver *drv = dev->driver; - int ret = 0; - if (!drv) - return 0; - - if (drv->pm) { - if (drv->pm->restore) - ret = drv->pm->restore(dev); - } else { - ret = platform_legacy_resume(dev); - } - - return ret; + return platform_pm_dispatch(dev, + drv && drv->pm ? drv->pm->restore : NULL, + platform_legacy_resume_state, PMSG_RESUME); } #endif /* CONFIG_HIBERNATE_CALLBACKS */ -- 2.53.0