mfd: sec: Change device_type to int

Now that sec-i2c doesn't match device type by pointer casting anymore,
we can switch the device type from unsigned long to int easily.

This saves a few bytes in struct sec_pmic_dev due to member alignment.

Signed-off-by: André Draszik <andre.draszik@linaro.org>
Link: https://lore.kernel.org/r/20250409-s2mpg10-v4-18-d66d5f39b6bf@linaro.org
Signed-off-by: Lee Jones <lee@kernel.org>

diff --git a/drivers/mfd/sec-common.c b/drivers/mfd/sec-common.c
index bb0eb3c2d9a260ddf2fb110cc255f08a0d25230d..4871492548f5efde4248b5b3db74045ec8c9d676 100644 (file)
--- a/drivers/mfd/sec-common.c
+++ b/drivers/mfd/sec-common.c
@@ -155,9 +155,8 @@ sec_pmic_parse_dt_pdata(struct device *dev)
        return pd;
 }
 
-int sec_pmic_probe(struct device *dev, unsigned long device_type,
-                  unsigned int irq, struct regmap *regmap,
-                  struct i2c_client *client)
+int sec_pmic_probe(struct device *dev, int device_type, unsigned int irq,
+                  struct regmap *regmap, struct i2c_client *client)
 {
        struct sec_platform_data *pdata;
        const struct mfd_cell *sec_devs;
@@ -232,7 +231,7 @@ int sec_pmic_probe(struct device *dev, unsigned long device_type,
                break;
        default:
                return dev_err_probe(sec_pmic->dev, -EINVAL,
-                                    "Unsupported device type %lu\n",
+                                    "Unsupported device type %d\n",
                                     sec_pmic->device_type);
        }
        ret = devm_mfd_add_devices(sec_pmic->dev, -1, sec_devs, num_sec_devs,
@@ -266,7 +265,7 @@ void sec_pmic_shutdown(struct device *dev)
                 * ignore the rest.
                 */
                dev_warn(sec_pmic->dev,
-                        "Unsupported device %lu for manual power off\n",
+                        "Unsupported device %d for manual power off\n",
                         sec_pmic->device_type);
                return;
        }

diff --git a/drivers/mfd/sec-core.h b/drivers/mfd/sec-core.h
index a0a3488924d96f69373e7569079cfefd0544ca26..92c7558ab8b0de44a52e028eeb7998e38358cb4c 100644 (file)
--- a/drivers/mfd/sec-core.h
+++ b/drivers/mfd/sec-core.h
@@ -14,9 +14,8 @@ struct i2c_client;
 
 extern const struct dev_pm_ops sec_pmic_pm_ops;
 
-int sec_pmic_probe(struct device *dev, unsigned long device_type,
-                  unsigned int irq, struct regmap *regmap,
-                  struct i2c_client *client);
+int sec_pmic_probe(struct device *dev, int device_type, unsigned int irq,
+                  struct regmap *regmap, struct i2c_client *client);
 void sec_pmic_shutdown(struct device *dev);
 
 int sec_irq_init(struct sec_pmic_dev *sec_pmic);

diff --git a/drivers/mfd/sec-i2c.c b/drivers/mfd/sec-i2c.c
index 41b09f5e3c49f410604a5d47e625cbb37d7f5fa2..2ccb494c8c024361c78e92be71ce9c215757dd89 100644 (file)
--- a/drivers/mfd/sec-i2c.c
+++ b/drivers/mfd/sec-i2c.c
@@ -27,7 +27,7 @@
 
 struct sec_pmic_i2c_platform_data {
        const struct regmap_config *regmap_cfg;
-       unsigned long device_type;
+       int device_type;
 };
 
 static bool s2mpa01_volatile(struct device *dev, unsigned int reg)

diff --git a/drivers/mfd/sec-irq.c b/drivers/mfd/sec-irq.c
index 79b4f74b05a24e413a84ff8c0b16156a828310e5..54c674574c701eec979d8c6a94909b78dcc77065 100644 (file)
--- a/drivers/mfd/sec-irq.c
+++ b/drivers/mfd/sec-irq.c
@@ -449,10 +449,9 @@ static const struct regmap_irq_chip s5m8767_irq_chip = {
 int sec_irq_init(struct sec_pmic_dev *sec_pmic)
 {
        int ret = 0;
-       int type = sec_pmic->device_type;
        const struct regmap_irq_chip *sec_irq_chip;
 
-       switch (type) {
+       switch (sec_pmic->device_type) {
        case S5M8767X:
                sec_irq_chip = &s5m8767_irq_chip;
                break;
@@ -484,7 +483,7 @@ int sec_irq_init(struct sec_pmic_dev *sec_pmic)
                break;
        default:
                return dev_err_probe(sec_pmic->dev, -EINVAL,
-                                    "Unsupported device type %lu\n",
+                                    "Unsupported device type %d\n",
                                     sec_pmic->device_type);
        }
 

diff --git a/include/linux/mfd/samsung/core.h b/include/linux/mfd/samsung/core.h
index c1102324172a9b6bd6072b5929a4866d6c9653fa..d785e101fe795a5d8f9cccf4ccc4232437e89416 100644 (file)
--- a/include/linux/mfd/samsung/core.h
+++ b/include/linux/mfd/samsung/core.h
@@ -67,7 +67,7 @@ struct sec_pmic_dev {
        struct regmap *regmap_pmic;
        struct i2c_client *i2c;
 
-       unsigned long device_type;
+       int device_type;
        int irq;
        struct regmap_irq_chip_data *irq_data;
 };