From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) (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 CC9CE3DDDB8 for ; Tue, 25 Aug 2026 08:28:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.180 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787646539; cv=none; b=pfDj359K0ZU327Gozh37sncFxvD6BiDNb3ToyzE+3arH0Zkiojeh7KcCOXRZaBr4CwjefJZS5ll7pAcFKmc+CanPj0LrwLplYgCx9vyBktxGrl5j9HOiyJPxXK0bUOG2DD+DWBubdxeLgzpQ/0IYi3T6+v1zD9z0hLYDAD6lDlU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787646539; c=relaxed/simple; bh=D1UCAtU9SxqGtG7q6DYSm91qmaVsbEgtt8rPORR9a+A=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=pWNBBXDySsCIFgr5vuhLlu0o2HzlI3ntZlaTc3QSmU92Tqii5DrYZVszaT24LP81aDs6vBsy+F52m/R5DIpIieNZTlLO9ClLxbt0GcxlGYbEwdhfERkR3Cghgj/71u/yInvX86hSnnDgcNbPcvywWFQthT+Bw+3Ir3c9FOl96F8= 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=fcEPt0CD; arc=none smtp.client-ip=209.85.215.180 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="fcEPt0CD" Received: by mail-pg1-f180.google.com with SMTP id 41be03b00d2f7-cbedbaba5fdso2675604a12.0 for ; Tue, 25 Aug 2026 01:28:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1787646537; x=1788251337; 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=auUE+jAHKPa+cSMKOTTSmj2ehc05SvpVRDH7zDwZHsU=; b=fcEPt0CDRWDhvcZJxb3I5keLGlVo7r87Jp2ovMSheAAYRLEf5FyIEt6qfGd6E8CITB swJquWo7aXB+tnf8eaVaUc/iYT0mxpwBY0HQUIsZLc144oMvFPzKodKG7rDWeoyRqKOE jT96QT15Dz2AmhVY/a5DMdKJ1W2cG/K4z8fAIFfl741NfB4GNEgr60YfBPtCtmdChVh0 ayt0gE4LrbxbARGRJn42tusR9KnD4GEnvLChH66s3R17npuxRL9hQknNACX2CTkPyjLW SEf6hzsBpLJhb8+aVDswA4h8HQtdVMLaZgVADgRN+6pmRmwDFamg3sYoG5xcsdWU/p4f cvIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787646537; x=1788251337; 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=auUE+jAHKPa+cSMKOTTSmj2ehc05SvpVRDH7zDwZHsU=; b=BDu3CBBj6nZfao3b6TsAOOhxM5XgqNPggL7xFu7Xkovqg9gyvQabYVb9JjgBtZ5beH fEyQHFkPKJx3tf7Hx1LcXCeubNcWIN0IHE/iFMiEZIM2qR5xbP/fZHXqixdlesBHaoaH ri0CYVBN3hdTvQ+tp5h/R+1UMn3xe+iFEV6qk04K0+laNWKswvYLuHaYxiftmircvWSL na4HV/evKoaCKw9b9TNmIi0No3stQBElLindjFBSeSj3XbPI3cRZwVJseysFfx6eRKrw JtR1QQaUTeyaJjO9TQElnXCAHMOlfdT1J3GogLTgMUHTQfvpbd00QFnhOLFehvZInKQd ZK+w== X-Forwarded-Encrypted: i=1; AHgh+RomYj41zAH4D0lEvuXSVzUXf7tjYC+tPwLQ4S3Un57kihW245ZHhsRfus6zGCeJr5LeX5zwoOMNCXez8OU=@vger.kernel.org X-Gm-Message-State: AFuF++kmLkbYGV4ljkV0GIr8fNt6KrPNKdLHab3X7rEpdCnmM4djTs60 xqqU1sk1hOov/j+8/7bnXO2EkZwDV6nqLK5XOBIjjW7Pg3qTAoPqDk0= X-Gm-Gg: AR+sD10+odgMm0F6iIlQatEmX8f4a4ZEYQerzr+ffkcpyj4YcbeZVlcn2VuHmBcOVvK jSs/h++IGrSZt0dXQbluUJt9OzyRvyQSpmgaSHLmvIgTsmfJzKdH3j1io0TYRrOze2W7taHtoEH JA5cw4gjpxzi7P205byIqhzkY6lfgf1MQxIZIU10VoOWmxaAVmgdwOLRfvlvYxyTYshht9XZnvo oOEWYnJfOBptBrPnRF6LvRZaMHURQt0FR2/TTLw9+K5eGMvnb/kKeHVjxGnAM0KMUTXBbFtNWFK TEuN4hLflB7dBknGkhH/ha0K1rgbM3dX09VjfRA5F/ckX4FikTMS+aEI4qGUrsm8OzgcP+4cP31 rIW/6oqCMu1pNeY3SYnxUXJ++PevwGcz6rEo2T8BVzUJ3x8g/q9p7vJ4SprjcXlIPWe+da80BuY mARGPPsFE3ZsdilaF9FM/5xFCFOiihJILD34bRRlAf4NSoaNwLaAcPZ+kHyd5L/sdzoDfKHKaaO g== X-Received: by 2002:a17:90b:53d0:b0:38e:bbf1:de3f with SMTP id 98e67ed59e1d1-395c359a74bmr59130797a91.12.1787646536867; Tue, 25 Aug 2026 01:28:56 -0700 (PDT) Received: from DL2XHKPB4.dl.net ([103.63.104.162]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-39645b3a49bsm2946379a91.6.2026.08.25.01.28.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Aug 2026 01:28:56 -0700 (PDT) From: Triet Hoang To: Maxim Levitsky Cc: Alex Dubov , Ulf Hansson , linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, Triet Hoang Subject: [PATCH] memstick: Convert to DEFINE_SIMPLE_DEV_PM_OPS() Date: Tue, 25 Aug 2026 15:27:17 +0700 Message-ID: <20260825082718.244949-1-triet.hoang.dev@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 Convert the deprecated SIMPLE_DEV_PM_OPS to DEFINE_SIMPLE_DEV_PM_OPS and pm_sleep_ptr(). This lets us drop the __maybe_unused annotations from the suspend and resume callbacks, also reduces kernel size in case CONFIG_PM or CONFIG_PM_SLEEP is disabled. Signed-off-by: Triet Hoang --- drivers/memstick/host/jmb38x_ms.c | 8 ++++---- drivers/memstick/host/r592.c | 6 ++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/memstick/host/jmb38x_ms.c b/drivers/memstick/host/jmb38x_ms.c index d93ba5e8662c..2f5f0e0677f5 100644 --- a/drivers/memstick/host/jmb38x_ms.c +++ b/drivers/memstick/host/jmb38x_ms.c @@ -792,7 +792,7 @@ static int jmb38x_ms_pmos(struct pci_dev *pdev, int flag) return 0; } -static int __maybe_unused jmb38x_ms_suspend(struct device *dev) +static int jmb38x_ms_suspend(struct device *dev) { struct jmb38x_ms *jm = dev_get_drvdata(dev); @@ -809,7 +809,7 @@ static int __maybe_unused jmb38x_ms_suspend(struct device *dev) return 0; } -static int __maybe_unused jmb38x_ms_resume(struct device *dev) +static int jmb38x_ms_resume(struct device *dev) { struct jmb38x_ms *jm = dev_get_drvdata(dev); int rc; @@ -1011,14 +1011,14 @@ static struct pci_device_id jmb38x_ms_id_tbl [] = { { } }; -static SIMPLE_DEV_PM_OPS(jmb38x_ms_pm_ops, jmb38x_ms_suspend, jmb38x_ms_resume); +static DEFINE_SIMPLE_DEV_PM_OPS(jmb38x_ms_pm_ops, jmb38x_ms_suspend, jmb38x_ms_resume); static struct pci_driver jmb38x_ms_driver = { .name = DRIVER_NAME, .id_table = jmb38x_ms_id_tbl, .probe = jmb38x_ms_probe, .remove = jmb38x_ms_remove, - .driver.pm = &jmb38x_ms_pm_ops, + .driver.pm = pm_sleep_ptr(&jmb38x_ms_pm_ops), }; module_pci_driver(jmb38x_ms_driver); diff --git a/drivers/memstick/host/r592.c b/drivers/memstick/host/r592.c index 605b2265536f..ba7d63eb5b31 100644 --- a/drivers/memstick/host/r592.c +++ b/drivers/memstick/host/r592.c @@ -847,7 +847,6 @@ static void r592_remove(struct pci_dev *pdev) memstick_free_host(dev->host); } -#ifdef CONFIG_PM_SLEEP static int r592_suspend(struct device *core_dev) { struct r592_device *dev = dev_get_drvdata(core_dev); @@ -868,9 +867,8 @@ static int r592_resume(struct device *core_dev) r592_update_card_detect(dev); return 0; } -#endif -static SIMPLE_DEV_PM_OPS(r592_pm_ops, r592_suspend, r592_resume); +static DEFINE_SIMPLE_DEV_PM_OPS(r592_pm_ops, r592_suspend, r592_resume); MODULE_DEVICE_TABLE(pci, r592_pci_id_tbl); @@ -879,7 +877,7 @@ static struct pci_driver r592_pci_driver = { .id_table = r592_pci_id_tbl, .probe = r592_probe, .remove = r592_remove, - .driver.pm = &r592_pm_ops, + .driver.pm = pm_sleep_ptr(&r592_pm_ops), }; module_pci_driver(r592_pci_driver); -- 2.53.0