On 29.02.24 20:52, Matthias Kaehlcke wrote:
> On Thu, Feb 29, 2024 at 09:34:50AM +0100, Javier Carrasco wrote:
>> Most of the functionality this driver provides can be used by non-hub
>> devices as well.
>>
>> To account for the hub-specific code, add a flag to the device data
>> structure and check its value for hub-specific code.
>>
>> The 'always_powered_in_supend' attribute is only available for hub
>> devices, keeping the driver's default behavior for non-hub devices (keep
>> on in suspend).
>>
>> Signed-off-by: Javier Carrasco <javier.carrasco@xxxxxxxxxxxxxx>
>> ---
>> drivers/usb/misc/onboard_usb_dev.c | 25 ++++++++++++++++++++++++-
>> drivers/usb/misc/onboard_usb_dev.h | 10 ++++++++++
>> 2 files changed, 34 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/usb/misc/onboard_usb_dev.c b/drivers/usb/misc/onboard_usb_dev.c
>> index 4ae580445408..f1b174503c44 100644
>> --- a/drivers/usb/misc/onboard_usb_dev.c
>> +++ b/drivers/usb/misc/onboard_usb_dev.c
>> @@ -261,7 +261,27 @@ static struct attribute *onboard_dev_attrs[] = {
>> &dev_attr_always_powered_in_suspend.attr,
>> NULL,
>> };
>> -ATTRIBUTE_GROUPS(onboard_dev);
>> +
>> +static umode_t onboard_dev_attrs_are_visible(struct kobject *kobj,
>> + struct attribute *attr,
>> + int n)
>> +{
>> + struct device *dev = kobj_to_dev(kobj);
>> + struct onboard_dev *onboard_dev = dev_get_drvdata(dev);
>> +
>> + if (attr == &dev_attr_always_powered_in_suspend.attr &&
>> + !onboard_dev->pdata->is_hub)
>> + return 0;
>> +
>> + return attr->mode;
>> +}
>> +
>> +static const struct attribute_group onboard_dev_group = {
>> + .is_visible = onboard_dev_attrs_are_visible,
>> + .attrs = onboard_dev_attrs,
>> +};
>> +__ATTRIBUTE_GROUPS(onboard_dev);
>> +
>
> nit: remove one empty line
>
>>
>> static void onboard_dev_attach_usb_driver(struct work_struct *work)
>> {
>> @@ -286,6 +306,9 @@ static int onboard_dev_probe(struct platform_device *pdev)
>> if (!onboard_dev->pdata)
>> return -EINVAL;
>>
>> + if (!onboard_dev->pdata->is_hub)
>> + onboard_dev->always_powered_in_suspend = true;
>> +
>> onboard_dev->dev = dev;
>>
>> err = onboard_dev_get_regulators(onboard_dev);
>> diff --git a/drivers/usb/misc/onboard_usb_dev.h b/drivers/usb/misc/onboard_usb_dev.h
>> index 4da9f3b7f9e9..58cf8c81b2cf 100644
>> --- a/drivers/usb/misc/onboard_usb_dev.h
>> +++ b/drivers/usb/misc/onboard_usb_dev.h
>> @@ -12,60 +12,70 @@ struct onboard_dev_pdata {
>> unsigned long reset_us; /* reset pulse width in us */
>> unsigned int num_supplies; /* number of supplies */
>> const char * const supply_names[MAX_SUPPLIES];
>> + bool is_hub; /* true if the device is a HUB */
>
> nit: either drop the comment (the variable name is pretty self explaining),
> or s/HUB/hub/ ('hub' isn't an acronym).
>
> Acked-by: Matthias Kaehlcke <mka@xxxxxxxxxxxx>
To be honest, I added the description to follow the same pattern used
for the previous fields:
unsigned long reset_us; /* reset pulse width in us */
unsigned int num_supplies; /* number of supplies */
Best regards,
Javier Carrasco
