public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-18 22:14:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

mfd: sec: Change device_type to int

Browse source 
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>
This commit is contained in:
André Draszik 2025-04-09 21:37:39 +01:00 • committed by Lee Jones
parent aaaeae7e2a
commit adf91d9e19
5 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/mfd/sec-common.c
View file

@ -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;
}

5
drivers/mfd/sec-core.h
View file

@ -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);

2
drivers/mfd/sec-i2c.c
View file

@ -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)

5
drivers/mfd/sec-irq.c
View file

@ -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);
}

2
include/linux/mfd/samsung/core.h
View file

@ -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;
};