[PATCH] staging: most: do not show interface dependent attrs by default in sysfs

Greg KH gregkh at linuxfoundation.org
Fri Jun 15 12:16:50 UTC 2018


On Fri, Jun 15, 2018 at 01:54:02PM +0200, Christian Gromm wrote:
> The channel attribute dbr_size is only relevant for the DIM2 interface. So
> is the packets_per_xact for USB. Currently, all attrs are shown by default
> in sysfs for any channel. To get a clean content of a channel directory,
> this patch makes the attributes show up only on the channel they belong to.
> 
> Signed-off-by: Christian Gromm <christian.gromm at microchip.com>
> ---
>  drivers/staging/most/core.c      | 12 +++++++++---
>  drivers/staging/most/core.h      |  5 +++++
>  drivers/staging/most/dim2/dim2.c |  1 +
>  drivers/staging/most/usb/usb.c   |  1 +
>  4 files changed, 16 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/staging/most/core.c b/drivers/staging/most/core.c
> index f4c4646..19694a1 100644
> --- a/drivers/staging/most/core.c
> +++ b/drivers/staging/most/core.c
> @@ -25,6 +25,7 @@
>  
>  #define MAX_CHANNELS	64
>  #define STRING_SIZE	80
> +#define MAX_NUM_ATTRS	14
>  
>  static struct ida mdev_id;
>  static int dummy_num_buffers;
> @@ -459,7 +460,7 @@ static DEVICE_ATTR_RW(set_subbuffer_size);
>  static DEVICE_ATTR_RW(set_packets_per_xact);
>  static DEVICE_ATTR_RW(set_dbr_size);
>  
> -static struct attribute *channel_attrs[] = {
> +static struct attribute *channel_attrs[MAX_NUM_ATTRS] = {

Ick, static arrays are going to be a pain.

>  	DEV_ATTR(available_directions),
>  	DEV_ATTR(available_datatypes),
>  	DEV_ATTR(number_of_packet_buffers),
> @@ -472,8 +473,6 @@ static struct attribute *channel_attrs[] = {
>  	DEV_ATTR(set_direction),
>  	DEV_ATTR(set_datatype),
>  	DEV_ATTR(set_subbuffer_size),
> -	DEV_ATTR(set_packets_per_xact),
> -	DEV_ATTR(set_dbr_size),
>  	NULL,
>  };
>  
> @@ -1416,6 +1415,13 @@ int most_register_interface(struct most_interface *iface)
>  	iface->dev.init_name = iface->p->name;
>  	iface->dev.bus = &mc.bus;
>  	iface->dev.parent = &mc.dev;
> +	if (iface->extra_attrs == XACT_ATTRS) {
> +		channel_attrs[12] = DEV_ATTR(set_packets_per_xact);
> +		channel_attrs[13] = NULL;
> +	} else if (iface->extra_attrs == DBR_ATTRS) {
> +		channel_attrs[12] = DEV_ATTR(set_dbr_size);
> +		channel_attrs[13] = NULL;
> +	}

Don't do this, it's going to get messy fast.

What's wrong with the normal way hide attributes?  Why not use that
instead of this "custom" hack?

thanks,

greg k-h


More information about the devel mailing list