From nobody Tue Dec 2 02:06:09 2025 Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) (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 4C4A4290D81 for ; Thu, 20 Nov 2025 14:38:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763649490; cv=none; b=n68Dv/pULXUUekHJh1jdbSSSrmyrJvpWtd4zuQUqQ8RXLyfumm7G9PPX8B63TT+I99kuOg6pb6mWdvXsbUQSTZA5iM2z2/D8wWvYqqXaVIwKNISlYFfNMtihEtFS5x5z4yTwgh3umaQjtQcCNrQHatDXPbS0Dckr00N15KN96Io= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763649490; c=relaxed/simple; bh=8jm84u7LjLlfXvCKgFxIMadhoffbXTuom3rGA8x1cuk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=pWdTkPYk43AGvYVuVrZWT8YToBEmI5ZaV74lgLJpPM3G5pt44RSzmkJIEB7D6INaSdmv23e+C/HJonDqekDhi0p538LlSXHnGA1ObRRYbYHZzKfac/xL3GrWTyEJk5shK+66QDngzYhD2yRWyvE4YyNl/qAzr2e+Alm81U21hZE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=RxEEFt4F; arc=none smtp.client-ip=209.85.218.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="RxEEFt4F" Received: by mail-ej1-f45.google.com with SMTP id a640c23a62f3a-b739ef3f739so191070466b.1 for ; Thu, 20 Nov 2025 06:38:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1763649486; x=1764254286; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=xlPjCAelRnLfSQEAgwBc6NbAVq3HOSTWNjdTmYgiuP8=; b=RxEEFt4FhdEQ8EL2N4bGt2schNO00NrKFfzOBSWDncyeFj3JewR76XoFUtiOlZd7LA yuLo+XjAtiVNvZvJBoX3rbn7J2RbY7nsbFYyp5J7UyAZ6lnjiF0363CYwYKeuti/8YrS VMpKwzWmIrOpMalIC7xXS6oQqnrJyWiWKV7G2UjVbI4nScbdhXtkREdZEX9UkxlcPHrJ 0Qc529MchRbhTTaiewJq0qTzZ+hesA3G8IOfUOlklkp5afqjBrPc11M0MFnWApXYkIWj jbb3IcYlmHHASTmSC+2+eSBnGA1AEkZLsuDWU6UQL1yUikXuxd+8JdQypM+r06q06FcW zzgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763649486; x=1764254286; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=xlPjCAelRnLfSQEAgwBc6NbAVq3HOSTWNjdTmYgiuP8=; b=Y22jQIRG2CgFVwFxRcYAqppVvxeD+tVqOXDWW3zoUg2tAN0mAVEwWT0xb6g8sVhbKt e3X8BVTGcR/KbVlz7CnVuw9jCnPO4h/qJzdDylG9iWKmBr0OcpnP1tNgb5LkFLhhlNdH ChgrOBoGRFQA/mxkGvJIfs0klc3Vj9HvhEyxqtCwLxusCd65OdfzhQy3MbzHcoDfzpJY BX1T+QSAdUffmTOVuZyall8hxBfrc1j0zQ1g5v25xemDBuOO7bhLTSErp4KYGw1h2k43 e5DAKMK8sMCT00eD8FFsw8/7ndK5q6IKVll/ZuJ6wHKs7Mi3xoio9e+opx5uEcjKCXaQ d68g== X-Forwarded-Encrypted: i=1; AJvYcCUHZj9zWmWmiY8vaV3hLiCiFZmcfVvMdE7lDPDIBlI5pRD0bavaKI0Q2LvyfRgvK5YeGmlDZLpLQ7EwJeQ=@vger.kernel.org X-Gm-Message-State: AOJu0YywLNy+873IqSgd37AIB7791izzOoAhM/MB6RxDNr2a+/7gjBl1 iowqsTaIdFxmKVRFpThwouRh0wb+yUZx4/tZWQ1xvpikc4Bq3d8bje7ZafVq6j6etzI= X-Gm-Gg: ASbGncsAOyl/FUj1t8KqAKSkLFNAwj4Qvq1/YFwPwaXbE8k2P6FCSipYeIq7xwSwe4Q laipjRarQIf22th3hKq/rMwQwbhICAT6MX1hdB3apgxSRRkGlDWIVYRXg4+gvBnS110YFbJoLh7 MH0AcOrgQMAB78+CmTmn/B1NDx0J77z4Pl1qRKsDErZ2E7bQiQCp1Nh+bvjJghIX9FCmcAGueye LSxBjOUU0apv8puNl+8LdCYy7WH335/XO2Cw+lDvZqOB1wiBz0gQh0ocOLC5OKOHL9mVXz2mAdf hVDSMb7pwP24JYNy/Qo1B0shcVkoHzBQe+Uacla13Jls0yj3N2xSQl93VR6owOk2ATcH4lPr6Bs zkvZ2ZKOoZ9oxRUHLO5ZokKekA2sLBrr3HZEDzxaZwq/EuRU0M+57bbxQ5GQQ/mEejzvZKoMcBj idV9f7BuvM2zZzpVxK0ie1Wz1YEsP7gKMaVa63g1hYKcjlYMwRaoWfWZZu9KJGBj0EYxX4ts/72 pLKNA== X-Google-Smtp-Source: AGHT+IF/WeYzeqGTdxWSV6LVCDSCdC4Yk31C1Uj6CW7uE4VKWNFHeWPwZZjuMvG6qurVmjk+ZY9BiQ== X-Received: by 2002:a17:907:c14:b0:b76:277b:9a58 with SMTP id a640c23a62f3a-b7654d8ce57mr388131666b.9.1763649486579; Thu, 20 Nov 2025 06:38:06 -0800 (PST) Received: from puffmais2.c.googlers.com (180.192.141.34.bc.googleusercontent.com. [34.141.192.180]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b7655050927sm214326566b.71.2025.11.20.06.38.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Nov 2025 06:38:06 -0800 (PST) From: =?utf-8?q?Andr=C3=A9_Draszik?= Date: Thu, 20 Nov 2025 14:38:06 +0000 Subject: [PATCH v2 3/3] mfd: sec: drop now unused struct sec_pmic_dev::irq_data 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" Content-Transfer-Encoding: quoted-printable Message-Id: <20251120-s5m-alarm-v2-3-cc15f0e32161@linaro.org> References: <20251120-s5m-alarm-v2-0-cc15f0e32161@linaro.org> In-Reply-To: <20251120-s5m-alarm-v2-0-cc15f0e32161@linaro.org> To: Krzysztof Kozlowski , Lee Jones , Alexandre Belloni Cc: Peter Griffin , Tudor Ambarus , Will McVicker , Juan Yescas , Douglas Anderson , kernel-team@android.com, Kaustabh Chakraborty , linux-kernel@vger.kernel.org, linux-samsung-soc@vger.kernel.org, linux-rtc@vger.kernel.org, =?utf-8?q?Andr=C3=A9_Draszik?= X-Mailer: b4 0.14.2 This was used only to allow the s5m RTC driver to deal with the alarm IRQ. That driver now uses a different approach to acquire that IRQ, and ::irq_data doesn't need to be kept around anymore. Signed-off-by: Andr=C3=A9 Draszik --- drivers/mfd/sec-common.c | 9 +++--- drivers/mfd/sec-core.h | 2 +- drivers/mfd/sec-irq.c | 63 ++++++++++++++++++------------------= ---- include/linux/mfd/samsung/core.h | 1 - 4 files changed, 35 insertions(+), 40 deletions(-) diff --git a/drivers/mfd/sec-common.c b/drivers/mfd/sec-common.c index 77370db52a7ba81234136b29f85892f4b197f429..0021f9ae8484fd0afc2e47c813a= 953c91fa38546 100644 --- a/drivers/mfd/sec-common.c +++ b/drivers/mfd/sec-common.c @@ -163,6 +163,7 @@ sec_pmic_parse_dt_pdata(struct device *dev) int sec_pmic_probe(struct device *dev, int device_type, unsigned int irq, struct regmap *regmap, struct i2c_client *client) { + struct regmap_irq_chip_data *irq_data; struct sec_platform_data *pdata; const struct mfd_cell *sec_devs; struct sec_pmic_dev *sec_pmic; @@ -187,9 +188,9 @@ int sec_pmic_probe(struct device *dev, int device_type,= unsigned int irq, =20 sec_pmic->pdata =3D pdata; =20 - ret =3D sec_irq_init(sec_pmic); - if (ret) - return ret; + irq_data =3D sec_irq_init(sec_pmic); + if (IS_ERR(irq_data)) + return PTR_ERR(irq_data); =20 pm_runtime_set_active(sec_pmic->dev); =20 @@ -240,7 +241,7 @@ int sec_pmic_probe(struct device *dev, int device_type,= unsigned int irq, sec_pmic->device_type); } ret =3D devm_mfd_add_devices(sec_pmic->dev, -1, sec_devs, num_sec_devs, - NULL, 0, regmap_irq_get_domain(sec_pmic->irq_data)); + NULL, 0, regmap_irq_get_domain(irq_data)); if (ret) return ret; =20 diff --git a/drivers/mfd/sec-core.h b/drivers/mfd/sec-core.h index 92c7558ab8b0de44a52e028eeb7998e38358cb4c..8d85c70c232612d1f7e5fb61b2a= cd25bf03a62e0 100644 --- a/drivers/mfd/sec-core.h +++ b/drivers/mfd/sec-core.h @@ -18,6 +18,6 @@ int sec_pmic_probe(struct device *dev, int device_type, u= nsigned int irq, struct regmap *regmap, struct i2c_client *client); void sec_pmic_shutdown(struct device *dev); =20 -int sec_irq_init(struct sec_pmic_dev *sec_pmic); +struct regmap_irq_chip_data *sec_irq_init(struct sec_pmic_dev *sec_pmic); =20 #endif /* __SEC_CORE_INT_H */ diff --git a/drivers/mfd/sec-irq.c b/drivers/mfd/sec-irq.c index d992e41e716dcdc060421e1db8475523842a12be..96f53c3617da4cb54f650f9b98c= 0b934b823ceda 100644 --- a/drivers/mfd/sec-irq.c +++ b/drivers/mfd/sec-irq.c @@ -268,26 +268,28 @@ static const struct regmap_irq_chip s5m8767_irq_chip = =3D { .ack_base =3D S5M8767_REG_INT1, }; =20 -static int s2mpg1x_add_chained_irq_chip(struct device *dev, struct regmap = *regmap, int pirq, - struct regmap_irq_chip_data *parent, - const struct regmap_irq_chip *chip, - struct regmap_irq_chip_data **data) +static struct regmap_irq_chip_data * +s2mpg1x_add_chained_irq_chip(struct device *dev, struct regmap *regmap, in= t pirq, + struct regmap_irq_chip_data *parent, + const struct regmap_irq_chip *chip) { + struct regmap_irq_chip_data *data; int irq, ret; =20 irq =3D regmap_irq_get_virq(parent, pirq); if (irq < 0) - return dev_err_probe(dev, irq, "Failed to get parent vIRQ(%d) for chip %= s\n", pirq, - chip->name); + return dev_err_ptr_probe(dev, irq, "Failed to get parent vIRQ(%d) for ch= ip %s\n", + pirq, chip->name); =20 - ret =3D devm_regmap_add_irq_chip(dev, regmap, irq, IRQF_ONESHOT | IRQF_SH= ARED, 0, chip, data); + ret =3D devm_regmap_add_irq_chip(dev, regmap, irq, IRQF_ONESHOT | IRQF_SH= ARED, 0, chip, + &data); if (ret) - return dev_err_probe(dev, ret, "Failed to add %s IRQ chip\n", chip->name= ); + return dev_err_ptr_probe(dev, ret, "Failed to add %s IRQ chip\n", chip->= name); =20 - return 0; + return data; } =20 -static int sec_irq_init_s2mpg1x(struct sec_pmic_dev *sec_pmic) +static struct regmap_irq_chip_data *sec_irq_init_s2mpg1x(struct sec_pmic_d= ev *sec_pmic) { const struct regmap_irq_chip *irq_chip, *chained_irq_chip; struct regmap_irq_chip_data *irq_data; @@ -302,27 +304,28 @@ static int sec_irq_init_s2mpg1x(struct sec_pmic_dev *= sec_pmic) chained_pirq =3D S2MPG10_COMMON_IRQ_PMIC; break; default: - return dev_err_probe(sec_pmic->dev, -EINVAL, "Unsupported device type %d= \n", - sec_pmic->device_type); + return dev_err_ptr_probe(sec_pmic->dev, -EINVAL, "Unsupported device typ= e %d\n", + sec_pmic->device_type); }; =20 regmap_common =3D dev_get_regmap(sec_pmic->dev, "common"); if (!regmap_common) - return dev_err_probe(sec_pmic->dev, -EINVAL, "No 'common' regmap %d\n", - sec_pmic->device_type); + return dev_err_ptr_probe(sec_pmic->dev, -EINVAL, "No 'common' regmap %d\= n", + sec_pmic->device_type); =20 ret =3D devm_regmap_add_irq_chip(sec_pmic->dev, regmap_common, sec_pmic->= irq, IRQF_ONESHOT, 0, irq_chip, &irq_data); if (ret) - return dev_err_probe(sec_pmic->dev, ret, "Failed to add %s IRQ chip\n", - irq_chip->name); + return dev_err_ptr_probe(sec_pmic->dev, ret, "Failed to add %s IRQ chip\= n", + irq_chip->name); =20 return s2mpg1x_add_chained_irq_chip(sec_pmic->dev, sec_pmic->regmap_pmic,= chained_pirq, - irq_data, chained_irq_chip, &sec_pmic->irq_data); + irq_data, chained_irq_chip); } =20 -int sec_irq_init(struct sec_pmic_dev *sec_pmic) +struct regmap_irq_chip_data *sec_irq_init(struct sec_pmic_dev *sec_pmic) { + struct regmap_irq_chip_data *sec_irq_chip_data; const struct regmap_irq_chip *sec_irq_chip; int ret; =20 @@ -331,7 +334,7 @@ int sec_irq_init(struct sec_pmic_dev *sec_pmic) sec_irq_chip =3D &s5m8767_irq_chip; break; case S2DOS05: - return 0; + return NULL; case S2MPA01: sec_irq_chip =3D &s2mps14_irq_chip; break; @@ -356,30 +359,22 @@ int sec_irq_init(struct sec_pmic_dev *sec_pmic) sec_irq_chip =3D &s2mpu05_irq_chip; break; default: - return dev_err_probe(sec_pmic->dev, -EINVAL, - "Unsupported device type %d\n", - sec_pmic->device_type); + return dev_err_ptr_probe(sec_pmic->dev, -EINVAL, "Unsupported device typ= e %d\n", + sec_pmic->device_type); } =20 if (!sec_pmic->irq) { dev_warn(sec_pmic->dev, "No interrupt specified, no interrupts\n"); - return 0; + return NULL; } =20 ret =3D devm_regmap_add_irq_chip(sec_pmic->dev, sec_pmic->regmap_pmic, sec_pmic->irq, IRQF_ONESHOT, - 0, sec_irq_chip, &sec_pmic->irq_data); + 0, sec_irq_chip, &sec_irq_chip_data); if (ret) - return dev_err_probe(sec_pmic->dev, ret, - "Failed to add %s IRQ chip\n", - sec_irq_chip->name); + return dev_err_ptr_probe(sec_pmic->dev, ret, "Failed to add %s IRQ chip\= n", + sec_irq_chip->name); =20 - /* - * The rtc-s5m driver requests S2MPS14_IRQ_RTCA0 also for S2MPS11 - * so the interrupt number must be consistent. - */ - BUILD_BUG_ON(((enum s2mps14_irq)S2MPS11_IRQ_RTCA0) !=3D S2MPS14_IRQ_RTCA0= ); - - return 0; + return sec_irq_chip_data; } diff --git a/include/linux/mfd/samsung/core.h b/include/linux/mfd/samsung/c= ore.h index d785e101fe795a5d8f9cccf4ccc4232437e89416..c7c3c8cd8d5f99ef0cc3188e1c3= b49031f4750f2 100644 --- a/include/linux/mfd/samsung/core.h +++ b/include/linux/mfd/samsung/core.h @@ -69,7 +69,6 @@ struct sec_pmic_dev { =20 int device_type; int irq; - struct regmap_irq_chip_data *irq_data; }; =20 struct sec_platform_data { --=20 2.52.0.rc1.455.g30608eb744-goog