From nobody Tue Feb 10 06:25:03 2026 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 025D4392B71 for ; Tue, 13 Jan 2026 14:03:16 +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=1768312999; cv=none; b=ngmJ/Whccvl1G1K8QM+h1vQkBnWeLponaCqr7Joy0hzsXw6scJHClwsXFHUXXkig5xfY2XKHYa3wIwEZ8Ei61fPC46KbNpjVJY6xE5bAW20vHSnf4y0q/3M2LAqp48eS5SYR3rnk/geHOF1bR8RBEOAWQWhCrCRGPwlE0Wox/KE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768312999; c=relaxed/simple; bh=7EcWUnN0+N32pOYCO+1MoaYBsSNzfSeivRzWX9y8YCc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=tKC8VnSBSbqZfqJDdYfZcAsY0D680TArD0LuJeJjYHWLvRmhIRpMcIlL+EytkRYov+C4r6vF6LMRSdOL9UCs2yW3IiipcPN7IfQpqXJMDgb1ITpri48XzTQLqGRHFjca0qmOkznb/NhlfxhY4NSnvTetnDZ4SqpGJI6mU3pf1Q0= 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=vlz5V8MP; arc=none smtp.client-ip=209.85.208.44 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="vlz5V8MP" Received: by mail-ed1-f44.google.com with SMTP id 4fb4d7f45d1cf-650854c473fso3373786a12.1 for ; Tue, 13 Jan 2026 06:03:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1768312995; x=1768917795; 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=u2zaFPeW0OjuaYCVWPM7pM9hcNh6cwyjFk/ezWJ8SDE=; b=vlz5V8MPioRADm3VAhU54U6kofewBmqE5vYkAx1Vtdd6tF2teRc5xR+pBcPPYuyokT 2EFTokEdE6J4Cj9cHrAyPAre3ZG18qExkmZv6HJ6hWiZe6LFBUAKvA0lfenMaR333vBZ q38NXeNh/mwZIdKVziRqSf7TYYI2Coa26M4dsUCDYLFeVIysqNy53YMRF+8czcRlscO9 8gkwoG1M4QTrPjkBCVwCy94+8RhY49S5hUpQKpiawlC+BaRnYXO8NuIE1VaPDer8aqBr S2X0H//5Fgevx52Jf2uigYLYpFaxsLB4cEwMtSGRo9fbDAoFP7DjuGMEj/nlVxitvm2j 3Paw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768312995; x=1768917795; 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=u2zaFPeW0OjuaYCVWPM7pM9hcNh6cwyjFk/ezWJ8SDE=; b=LZymDycCdh4ghVpxP3kZZcJJARaFz+++uTM9YbRFtp2REidaqnRoguNnjfUqVczRU+ Yoy9eEq/wuHsCdZExGY9I9Jk4IhpE5v4G6ERGU40i2wMFIWmi9oxRq6eSjQOZL5eX6ob 9PWRjJHeZ3vL6RqzqgDBAuOuFBudoAoUBJ43xjeBg8y+CP4wRpyy5MtCRQq/PWBMNki7 x2ljifaEdi48X0nXotbB8b6GRV4ovtUEf71FIzZbsPMpIF9fKY+anSxRbxosLD+eLg3+ OaD71lp5G4xVG3b7G5UP0zOT2RPmOIMR+WtZ+IavZzqnuyMs/VS4ahKeZVXTL7nlEOAp XA6g== X-Forwarded-Encrypted: i=1; AJvYcCXqe3IXRJxg14Dul4bJtzhUO/GNqZ/lO6cOGbcLOoD8/Qx/XHZwp0m5gB8v0yYOS5J9FPCUrz2AsW3GGWM=@vger.kernel.org X-Gm-Message-State: AOJu0Ywm1JNqkXrJfWNQ6pjzZ5JQAahBVzfvyzT7VcdKL/UwFv7LKJ5d /K9JiBBTUiF0dgiLZ/S3ndJNyi2NUzThVRdVZaU/JSG4cgBY3p07S981apL7iYfNCU0= X-Gm-Gg: AY/fxX7QMSEqskVJaDNHOjgPYo9TNnpcLl7DutpKbTZ4xo6bf7jORmVa5Rqz8GPcU5G kdVdX4FYIgn0tKTPjSchka5YqHZLoQY1MuvM+srxDw63deZn+e6f4qusyBO5nvCPHmbrMKd77R4 +GNxaMsZWgA6AG86YX85cxuhqAlSfAShMy9x0QpVhN2SEkDvO5V/4EJj3qW1jTEuUTG8Gmlxhb2 jJ/dJf+AenIqYp18qMozz11kpN6kwmMysWyyzFRoBMayca9zY39A6wZMON2icEMJDP0tZLPU2lr k/FYnKJdClWsKB61nWUdry/k6ODlM6y3oTv8oTnjbIazeCfJbliZGDMahMFT2VvY9e7JTrBnjrR JHY2IdAlWnHRzh8nTqxebAa7/8B8jCAfXMNIqCz/mUFTBbX22EJ0sBXLdmxQhspqa9zSiPjPQ1L hgL7xLZKwySwDz58JsdEfKO9JblcNHzOpJAzmEE1KTFdFkaryvLXI2G5aLKfJEETJ6OiI40hRRt gviqw== X-Google-Smtp-Source: AGHT+IGy72R/EUzURB6M21xGkc6VsgnlOxnsyKpL+CiAACdFJ/LepvXg6sQq1k/76EpK7ARgXbCncA== X-Received: by 2002:a05:6402:510d:b0:649:c6fb:1f5c with SMTP id 4fb4d7f45d1cf-652e48f7ce4mr2713178a12.5.1768312995170; Tue, 13 Jan 2026 06:03:15 -0800 (PST) Received: from puffmais2.c.googlers.com (244.175.141.34.bc.googleusercontent.com. [34.141.175.244]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-6507bf65c07sm20139157a12.23.2026.01.13.06.03.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Jan 2026 06:03:14 -0800 (PST) From: =?utf-8?q?Andr=C3=A9_Draszik?= Date: Tue, 13 Jan 2026 14:03:13 +0000 Subject: [PATCH v3 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: <20260113-s5m-alarm-v3-3-855a19db1277@linaro.org> References: <20260113-s5m-alarm-v3-0-855a19db1277@linaro.org> In-Reply-To: <20260113-s5m-alarm-v3-0-855a19db1277@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 --- v3: - make s2mpg1x_add_chained_irq_chip() specific to PMIC irq chip (Lee), and rename to s2mpg1x_add_chained_pmic() (Andre) v2: - return struct regmap_irq_chip_data * in sec_irq_init() (Lee) --- drivers/mfd/sec-common.c | 9 +++--- drivers/mfd/sec-core.h | 2 +- drivers/mfd/sec-irq.c | 64 ++++++++++++++++++------------------= ---- include/linux/mfd/samsung/core.h | 1 - 4 files changed, 35 insertions(+), 41 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 74ac70002d1fc54c7eeb78cfc21b6117a3e14b03..e0dd122e8fe5ad86ae1e97dc1a4= b1605d1813a64 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_pmic(struct sec_pmic_dev *sec_pmic, int pirq, + struct regmap_irq_chip_data *parent, const struct regmap_irq_chip *chi= p) { + struct device *dev =3D sec_pmic->dev; + 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, sec_pmic->regmap_pmic, irq, + IRQF_ONESHOT | IRQF_SHARED, 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,27 @@ 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); + return s2mpg1x_add_chained_pmic(sec_pmic, chained_pirq, 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 +333,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 +358,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.457.g6b5491de43-goog