On Thu, Aug 21, 2025 at 03:39:04PM +0000, Sven Peter wrote:
> We're about to add more fields to struct tps6598x which are only relevant
> for Apple's CD321x and to ensure that we don't waste memory everywhere for
> those add a separate struct for cd321x and prepare to allocate more space
> inside probe.
>
> Signed-off-by: Sven Peter <sven@xxxxxxxxxx>
Reviewed-by: Heikki Krogerus <heikki.krogerus@xxxxxxxxxxxxxxx>
> ---
> drivers/usb/typec/tipd/core.c | 20 +++++++++++++++-----
> 1 file changed, 15 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/usb/typec/tipd/core.c b/drivers/usb/typec/tipd/core.c
> index 19d713937870304e68325a441b0de63eb5db3b80..51b0f3be8b66a743ddc3ea96c1b25f597a1e8f6c 100644
> --- a/drivers/usb/typec/tipd/core.c
> +++ b/drivers/usb/typec/tipd/core.c
> @@ -113,6 +113,7 @@ struct tps6598x;
> struct tipd_data {
> irq_handler_t irq_handler;
> u64 irq_mask1;
> + size_t tps_struct_size;
> int (*register_port)(struct tps6598x *tps, struct fwnode_handle *node);
> void (*trace_data_status)(u32 status);
> void (*trace_power_status)(u16 status);
> @@ -148,6 +149,10 @@ struct tps6598x {
> const struct tipd_data *data;
> };
>
> +struct cd321x {
> + struct tps6598x tps;
> +};
> +
> static enum power_supply_property tps6598x_psy_props[] = {
> POWER_SUPPLY_PROP_USB_TYPE,
> POWER_SUPPLY_PROP_ONLINE,
> @@ -1297,18 +1302,24 @@ tps25750_register_port(struct tps6598x *tps, struct fwnode_handle *fwnode)
>
> static int tps6598x_probe(struct i2c_client *client)
> {
> + const struct tipd_data *data;
> struct tps6598x *tps;
> struct fwnode_handle *fwnode;
> u32 status;
> u32 vid;
> int ret;
>
> - tps = devm_kzalloc(&client->dev, sizeof(*tps), GFP_KERNEL);
> + data = i2c_get_match_data(client);
> + if (!data)
> + return -EINVAL;
> +
> + tps = devm_kzalloc(&client->dev, data->tps_struct_size, GFP_KERNEL);
> if (!tps)
> return -ENOMEM;
>
> mutex_init(&tps->lock);
> tps->dev = &client->dev;
> + tps->data = data;
>
> tps->reset = devm_gpiod_get_optional(tps->dev, "reset", GPIOD_OUT_LOW);
> if (IS_ERR(tps->reset))
> @@ -1334,10 +1345,6 @@ static int tps6598x_probe(struct i2c_client *client)
> if (i2c_check_functionality(client->adapter, I2C_FUNC_I2C))
> tps->i2c_protocol = true;
>
> - tps->data = i2c_get_match_data(client);
> - if (!tps->data)
> - return -EINVAL;
> -
> if (tps->data->switch_power_state) {
> ret = tps->data->switch_power_state(tps, TPS_SYSTEM_POWER_STATE_S0);
> if (ret)
> @@ -1521,6 +1528,7 @@ static const struct tipd_data cd321x_data = {
> .irq_mask1 = APPLE_CD_REG_INT_POWER_STATUS_UPDATE |
> APPLE_CD_REG_INT_DATA_STATUS_UPDATE |
> APPLE_CD_REG_INT_PLUG_EVENT,
> + .tps_struct_size = sizeof(struct cd321x),
> .register_port = tps6598x_register_port,
> .trace_data_status = trace_cd321x_data_status,
> .trace_power_status = trace_tps6598x_power_status,
> @@ -1535,6 +1543,7 @@ static const struct tipd_data tps6598x_data = {
> .irq_mask1 = TPS_REG_INT_POWER_STATUS_UPDATE |
> TPS_REG_INT_DATA_STATUS_UPDATE |
> TPS_REG_INT_PLUG_EVENT,
> + .tps_struct_size = sizeof(struct tps6598x),
> .register_port = tps6598x_register_port,
> .trace_data_status = trace_tps6598x_data_status,
> .trace_power_status = trace_tps6598x_power_status,
> @@ -1549,6 +1558,7 @@ static const struct tipd_data tps25750_data = {
> .irq_mask1 = TPS_REG_INT_POWER_STATUS_UPDATE |
> TPS_REG_INT_DATA_STATUS_UPDATE |
> TPS_REG_INT_PLUG_EVENT,
> + .tps_struct_size = sizeof(struct tps6598x),
> .register_port = tps25750_register_port,
> .trace_data_status = trace_tps6598x_data_status,
> .trace_power_status = trace_tps25750_power_status,
>
> --
> 2.34.1
>
--
heikki