From nobody Wed Feb 11 05:13:58 2026 Received: from mail-ed1-f49.google.com (mail-ed1-f49.google.com [209.85.208.49]) (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 95300343D84 for ; Wed, 17 Dec 2025 11:09:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765969789; cv=none; b=oG/Gh8dP0GHghSLQxf+YlHGfNKEuNdtlyapoJ6OSxm9ZzuNUmXTQ4n7iWHQ4pxAScW3VphHuEz9HwpCBod3tTAiQO0k45OlfLwV5Dzff/BvjrWv+E0zo7OsnzyONp5AGLrpBAyK7lF2agBhZVoRivaVJExUYHGe7X+uD6bMwC8w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765969789; c=relaxed/simple; bh=dkyXLuLg+7eYiSQma7cNLg4NKd9rhkvKdGkZMgOE4QY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=eWui3USpJ+zWu9Th/K6jrgKsKJe0l6acB2DpwzeZvcLc+kwDU2eJlQRU0wI1YTYHz1t4QgoqP91hMEx8Vdzal6wSbD0B8jdeO19PPDMG8OfvqUMekoxs3+CS4Ua1XJ0LOW4jrh5oQFAhkOHlu01C+E5D3bn2yBLk3CDhLBcbPUo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com; spf=pass smtp.mailfrom=baylibre.com; dkim=pass (2048-bit key) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b=zhYbuAzs; arc=none smtp.client-ip=209.85.208.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=baylibre.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b="zhYbuAzs" Received: by mail-ed1-f49.google.com with SMTP id 4fb4d7f45d1cf-647a3bca834so8406990a12.2 for ; Wed, 17 Dec 2025 03:09:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1765969784; x=1766574584; darn=vger.kernel.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=QVXfFEnyomZ7n1+faa+96lpi1G7Z02nuAcgJTrKE1/w=; b=zhYbuAzs8SLIplAIzXqbO80XdbI7uy37F61fvSV158Hz1N7WuU3ldMFFLjpFl+Rpmc jHf2V90JExRXfgc/xK561V/76sin0QVkQ9iMlVKkThl60scEC6sgkyx7YEoTEwjolBwo tl2VouMR6+6y+akf4SO7MdbE98VEG7akylLXOw3WLAebMbIzWXA0SRRqaJw6+Xxvp9LU Nn/aGQQwOETn0o3d1rOKfKCxnvIujTaUPOh33dmrRVN4s8zCWZnKcDlry+6jZz5paaHb xg0kNRNhhaWnn3U9z8fFnjQh9me2DUGN7ufmQZTkoKQkIFOjEHx+ssePHuHcI+REamvt +9VQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765969784; x=1766574584; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=QVXfFEnyomZ7n1+faa+96lpi1G7Z02nuAcgJTrKE1/w=; b=Nl0KzWjBPhOmYcVGm52J2uDY5t+sfESgy++UgvDL7jE8cAHEjyXtRTGRSTxz6teccl ZvMusiAfhGkwcsrN3LEhAAGC4GfJkupU5gFGNasNX/YxiwEjNghbBJKogfXGVzZ3UwmA A/o3lvA6ZuaQ7K2Y0v+mlYuTJp2TVfXNGry9TQdCdWkqB9OGBBdWP1Rl5vZnVYQCPw6v JHkRtAgN2I/awPYfN/5qqh/9NpHzVtTedFFzO5ZSvbwlMEE0Ta2Xq9xqrKF67QO9T7Mr QNMMHiaF5XxalDDgkFyHsK0JYr6l2FkznKVUapBkDue8FF51+nBaCdx2MNGtOsdRhi0N rdow== X-Forwarded-Encrypted: i=1; AJvYcCXx6TS8EN0kFgYLvwJywHucHEFWr7I730lBhNYZhdb7u4Wr0+5nP4nIw6BZRlRvYGwTz9rq1aNp4DirRKE=@vger.kernel.org X-Gm-Message-State: AOJu0YzEqvkqSun/JwbNUKx46jo2gsAifFiJAw8C+xvs+HHcQ1acIoAq 5Y63dFzYXQ/w/v/vwT1nd85gLMPAGsWJlLSU15vCx4DN22LzqgmQRbUdiiGHh5Tbd+4= X-Gm-Gg: AY/fxX6By+BKk1+9u58kJpYlHH9lIRc2YqU0nP3j1NVgbuE3FXwvcelj+lxPkv7aODB SYe69uEwsQBXwQwvYftUgyS4kw/ZMkujs0bq/fQOG/68EtJzOwn7kbjj1Ywq9qrSVHWUjOk7nYm vxxhnTF2ILhJBiIZyvtU0Vj+BMH6n5kHWKBxo1s44JfZTmoPH5g0lEcDPKviOM6RRztxOdYPHcq GepfuzFf5kr/46Sxiq4ACcJtR+KqC3yAAOpAb8g6BkenvWKFwEpbfSRo4fEOpm8WXJtEC+1W3sw yhnms7Aif9PDQUHkKW2llTYSw1B/xg9HmoGaILTJ2ULA2/EbMWi3YoNIhGmcW/u+Qrh9X67wh2I E67LRV42rIr4LD8mMd3dUXbINM6zL4PIoDjml68K0MFxl0rD9cJiQCX4Xhs/w4AkAhGVYN7uJlE 1s4CPvWyk1/8tX5mi6 X-Google-Smtp-Source: AGHT+IG02+mlmUp75Y8aN15AB3fqyEtjlYTbsKkWc4VXMQLd8E1R2A0XY8IFh9I/XNFQRNEDDaYuBw== X-Received: by 2002:a17:907:6e9f:b0:b73:6c97:af49 with SMTP id a640c23a62f3a-b7d23a972c5mr1808467566b.30.1765969783886; Wed, 17 Dec 2025 03:09:43 -0800 (PST) Received: from localhost ([2a02:8071:b783:6940:1d24:d58d:2b65:c291]) by smtp.gmail.com with UTF8SMTPSA id a640c23a62f3a-b7cfa2ebafcsm1939736266b.28.2025.12.17.03.09.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Dec 2025 03:09:43 -0800 (PST) From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: Ulf Hansson Cc: linux-mmc@vger.kernel.org, linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 2/4] wifi: rsi: sdio: Reduce use of #ifdef for CONFIG_PM Date: Wed, 17 Dec 2025 12:09:24 +0100 Message-ID: X-Mailer: git-send-email 2.47.3 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" X-Developer-Signature: v=1; a=openpgp-sha256; l=1529; i=u.kleine-koenig@baylibre.com; h=from:subject:message-id; bh=dkyXLuLg+7eYiSQma7cNLg4NKd9rhkvKdGkZMgOE4QY=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBpQo9nGdmxPZIIu7N/pwilj9mRvyvv5BXVkckRa 2AS6RJGwcKJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCaUKPZwAKCRCPgPtYfRL+ Tj7vB/4h44YpCoZWZ3nsb90FGI3e04zfgPviKqmXaBoofMxTHX8kvhuiVW6F5dF0uaw1lqnOOeP +FFPqthr5lT396O8SnCeY2/m9Po3sMCQc8L8z42wwrWi4+1xzhvGZIvFrpCJBJuQ4TC1o7KplNu Lk2D+CWBFdTnjn+cJAk4YK7y3Tkp+CF9V+kkvtgUlGkY0qdK53shaKTQ/D/B4ngV2g1FAlm9FKY T9ZwZD2mYwEZ4v9Zu7/KBVznsaIOrY+76NGS3SBqWPyLzviCui/APNfw5bEj0/6roQUECMWMHzC w61S+QQ/YpQ77CdfBgm3FPFPPx5KKNGUJoB4/OLbHuIKOWAF X-Developer-Key: i=u.kleine-koenig@baylibre.com; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 Content-Transfer-Encoding: quoted-printable This drops two #ifdefs (which is good because they are ugly) without changing semantics. This also improves compile coverage because all the code in the first #ifdef block is now compiled even for configurations without CONFIG_PM (and then thrown away). Signed-off-by: Uwe Kleine-K=C3=B6nig --- drivers/net/wireless/rsi/rsi_91x_sdio.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/net/wireless/rsi/rsi_91x_sdio.c b/drivers/net/wireless= /rsi/rsi_91x_sdio.c index 1e578533e473..c2b2d09b616f 100644 --- a/drivers/net/wireless/rsi/rsi_91x_sdio.c +++ b/drivers/net/wireless/rsi/rsi_91x_sdio.c @@ -1243,7 +1243,6 @@ static void rsi_disconnect(struct sdio_func *pfunctio= n) =20 } =20 -#ifdef CONFIG_PM static int rsi_set_sdio_pm_caps(struct rsi_hw *adapter) { struct rsi_91x_sdiodev *dev =3D adapter->rsi_dev; @@ -1499,7 +1498,6 @@ static const struct dev_pm_ops rsi_pm_ops =3D { .thaw =3D rsi_thaw, .restore =3D rsi_restore, }; -#endif =20 static const struct sdio_device_id rsi_dev_table[] =3D { { SDIO_DEVICE(SDIO_VENDOR_ID_RSI, SDIO_DEVICE_ID_RSI_9113) }, @@ -1512,12 +1510,10 @@ static struct sdio_driver rsi_driver =3D { .probe =3D rsi_probe, .remove =3D rsi_disconnect, .id_table =3D rsi_dev_table, -#ifdef CONFIG_PM .drv =3D { - .pm =3D &rsi_pm_ops, - .shutdown =3D rsi_shutdown, + .pm =3D pm_ptr(&rsi_pm_ops), + .shutdown =3D pm_ptr(rsi_shutdown), } -#endif }; module_sdio_driver(rsi_driver); =20 --=20 2.47.3