From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ed1-f44.google.com (mail-ed1-f44.google.com [209.85.208.44]) (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 2FEE534F24D for ; Wed, 29 Oct 2025 16:33:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.44 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761755641; cv=none; b=O8/EHpiu4ld4TS4UAsmbBm1hY10nDliNxYY33vCGQjXeR69tpApeJTGRkk8jlvtFRX+x+mUFuoKszEDaOJXk1ijggVLLlbqAtr4Fm40r0En11a5+woh21/7CvTxIkSBNF6ii00R+s1wEh+I7r41pa3gqFGp4ICTJJDYO85tf81w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761755641; c=relaxed/simple; bh=KUSAVjewTwFiW9VLR1yzUFBIzCxCjea5cQlqAAL9Lys=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Hr4/BNBNFcR8Xs5VmD6hf0+MZkLnUf4mxkmx7J04P91ofilZ4+DM6TTG369q82txi3HOupuGQO7Pf7YyNP1It4IvJk9YtnEsBR8VpGbXFzgseOQWhYZ2ZGNQGkc50xtD2cngcTkt1sLAwnzKwyaI2iB9dNQ9SbtHAf7hb23FtPQ= 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=lSdr/5bv; arc=none smtp.client-ip=209.85.208.44 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="lSdr/5bv" Received: by mail-ed1-f44.google.com with SMTP id 4fb4d7f45d1cf-63c556b4e0cso6571228a12.1 for ; Wed, 29 Oct 2025 09:33:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761755636; x=1762360436; 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=JhxpRTp1uOQ7/yJc+0xNuSmcJdpaGHV/pw/kDcH2Yfg=; b=lSdr/5bvX4L9Id/q8FSipvEwyetUWz4WBkeyFYVVVBlPnTV0rwAUOnpEDqL/+tXuVS GWLtaRaqPNWhScrtCqGSSZ98mmwDjO+WvH7T1yO8nP9q1FAMPcGqOuObAHYfNdZF0+9B bXXAVe9Cozlc9uzmQ8teNiGwlXYryaqB1D731+cUoqfSp2P6yQKgQ1UXp7UAWaPfZGSv RSMgbmZdoi+3AXqfLwumOuYWEKwtFi4b8lc6qU/xzrKw8n2zBAOlOBCcIWQcs4HF4ep1 /IDVCbq9wBw+RZUO8VY9DM/HQ7eVcmMHMiy9uH8+dZk4CV4dt+fw1/fa2fb9mMMDBdqD bktw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761755636; x=1762360436; 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=JhxpRTp1uOQ7/yJc+0xNuSmcJdpaGHV/pw/kDcH2Yfg=; b=RehDWEnV+7B/qOBToucrUouIdqk+wff2je37071s3K+iN2LRPR6MGnQqTMYAtht4lT EkwqxUm1FqUsmzucmz+Tmi8GGNhdlEqYeRbSLwgPf3Pu4+oisTnjEUj9AUhUkLqUJW/c hgcS5d4Ynj4sLoj4grLT5ZURmf1RDQblu1DbOzZA+xkvDp4fk5Q/8vGICTAiBueoQ5Wa yzQyW7BliXbXBg6Tn5QHN14zKFGJJbsXuwW3RuRYtmn/kQpsZ0tGrjELZ6xg9k3pFTAM b9cdD13JJbAL6HWkJtBOdX/umx8KUNQGukrCqzxjfpF6A+iIU6zlcw6y9sOVgUtd3ox3 mC8w== X-Forwarded-Encrypted: i=1; AJvYcCWcRRx+AR+QrWFIkexCfLPnfJHe6a3QSdYGfS/NubFZfFhKIL7ojL9m90OIMcx5RzKHd8LkzC+ZZgvM@vger.kernel.org X-Gm-Message-State: AOJu0YzJjYefIW3YjNwCxi8o7b+7ikBWk56BsK9pSWUrdrOoAkmqChcZ V0E2I0O2MLpylNqsHLygVhg+MiqXkdYzQDcr+tB2+eliJRCeZvNLJ4T6 X-Gm-Gg: ASbGncsx/dd4R/jQEX4NrTf45gIhGp07UCUiQ+SbTUQPKAsbCm4aVirpCncv6NlA/4R 0JHibGGMPiPcutV9sspZTxg6F9gTfmY/znnLpSxKr2DSYM61wSBnpPSSEw8oSBBwsx7dSEnV714 BAfMg97YjO5kH1rjkCCcdqAjhBc+uBgvETkL1+wY49DzXTBAVS47fIJoucMvLV6YkeErCmcisuD mut5QbeVf1QPf9AQfgYe+EpW20q9+7nlqvjIx/zIubn4DkCT6554QEGFt4j9G0cMn0HnAYK36Nq jijB6KFNtYqzg2xUlufFTiJMkoJdLmXKeJbRlUn15Tsv79WzKfn9SEcc9+xlM99dIMjYqUh6s+k Jsc1yxpxZ9mIHONMJdy9heMBgk+RTdx32YXiuiieP+8wy7okADMO2xS5A2L10cB4Lq+fjtow/ge LmT4ENii9aNZfmy01V8yIGR8WFgwGWrYJ754rNFd8Ll7Kabq3FNBr30TCubOeuN7MJ+piw X-Google-Smtp-Source: AGHT+IEBhKyqSuQzRg5+jPbNr1lJJJfXBtMjYTViFyDgVE4pc7ia4Gu9caVkoUUyuihmK5MM+ILYDA== X-Received: by 2002:a05:6402:5c9:b0:62f:50ff:b675 with SMTP id 4fb4d7f45d1cf-6404437f5a7mr2656312a12.33.1761755636037; Wed, 29 Oct 2025 09:33:56 -0700 (PDT) Received: from localhost (p200300e41f274600f22f74fffe1f3a53.dip0.t-ipconnect.de. [2003:e4:1f27:4600:f22f:74ff:fe1f:3a53]) by smtp.gmail.com with UTF8SMTPSA id 4fb4d7f45d1cf-6404de640fcsm1695354a12.8.2025.10.29.09.33.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Oct 2025 09:33:54 -0700 (PDT) From: Thierry Reding To: Greg Kroah-Hartman , "Rafael J. Wysocki" Cc: x86@kernel.org, linux-arm-kernel@lists.infradead.org, linux-riscv@lists.infradead.org, linux-mips@vger.kernel.org, loongarch@lists.linux.dev, linuxppc-dev@lists.ozlabs.org, linux-sh@vger.kernel.org, linux-pci@vger.kernel.org, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 6/7] irqchip/irq-imx-gpcv2: Use contextual data instead of global variable Date: Wed, 29 Oct 2025 17:33:35 +0100 Message-ID: <20251029163336.2785270-7-thierry.reding@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251029163336.2785270-1-thierry.reding@gmail.com> References: <20251029163336.2785270-1-thierry.reding@gmail.com> Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Thierry Reding Pass the driver-specific data via the syscore struct and use it in the syscore ops. Signed-off-by: Thierry Reding --- Changes in v3: - adjust for API changes and update commit message - remove unused global variable drivers/irqchip/irq-imx-gpcv2.c | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/drivers/irqchip/irq-imx-gpcv2.c b/drivers/irqchip/irq-imx-gpcv2.c index 04f7ba0657be..ebfc659af385 100644 --- a/drivers/irqchip/irq-imx-gpcv2.c +++ b/drivers/irqchip/irq-imx-gpcv2.c @@ -19,6 +19,7 @@ struct gpcv2_irqchip_data { + struct syscore syscore; struct raw_spinlock rlock; void __iomem *gpc_base; u32 wakeup_sources[IMR_NUM]; @@ -26,8 +27,6 @@ struct gpcv2_irqchip_data { u32 cpu2wakeup; }; -static struct gpcv2_irqchip_data *imx_gpcv2_instance __ro_after_init; - static void __iomem *gpcv2_idx_to_reg(struct gpcv2_irqchip_data *cd, int i) { return cd->gpc_base + cd->cpu2wakeup + i * 4; @@ -35,14 +34,10 @@ static void __iomem *gpcv2_idx_to_reg(struct gpcv2_irqchip_data *cd, int i) static int gpcv2_wakeup_source_save(void *data) { - struct gpcv2_irqchip_data *cd; + struct gpcv2_irqchip_data *cd = data; void __iomem *reg; int i; - cd = imx_gpcv2_instance; - if (!cd) - return 0; - for (i = 0; i < IMR_NUM; i++) { reg = gpcv2_idx_to_reg(cd, i); cd->saved_irq_mask[i] = readl_relaxed(reg); @@ -54,13 +49,9 @@ static int gpcv2_wakeup_source_save(void *data) static void gpcv2_wakeup_source_restore(void *data) { - struct gpcv2_irqchip_data *cd; + struct gpcv2_irqchip_data *cd = data; int i; - cd = imx_gpcv2_instance; - if (!cd) - return; - for (i = 0; i < IMR_NUM; i++) writel_relaxed(cd->saved_irq_mask[i], gpcv2_idx_to_reg(cd, i)); } @@ -70,10 +61,6 @@ static const struct syscore_ops gpcv2_syscore_ops = { .resume = gpcv2_wakeup_source_restore, }; -static struct syscore gpcv2_syscore = { - .ops = &gpcv2_syscore_ops, -}; - static int imx_gpcv2_irq_set_wake(struct irq_data *d, unsigned int on) { struct gpcv2_irqchip_data *cd = d->chip_data; @@ -279,8 +266,9 @@ static int __init imx_gpcv2_irqchip_init(struct device_node *node, */ writel_relaxed(~0x1, cd->gpc_base + cd->cpu2wakeup); - imx_gpcv2_instance = cd; - register_syscore(&gpcv2_syscore); + cd->syscore.ops = &gpcv2_syscore_ops; + cd->syscore.data = cd; + register_syscore(&cd->syscore); /* * Clear the OF_POPULATED flag set in of_irq_init so that -- 2.51.0