Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 718ad681 authored by stephen hemminger's avatar stephen hemminger Committed by David S. Miller
Browse files

net: drop unused attribute argument from sysfs queue funcs 



The show and store functions don't need/use the attribute.

Signed-off-by: default avatarStephen Hemminger <sthemmin@microsoft.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ec6cc599

drivers/net/virtio_net.c

+1 −1
Original line number Diff line number Diff line
@@ -2376,7 +2376,7 @@ static int init_vqs(struct virtnet_info *vi) 


#ifdef CONFIG_SYSFS

static ssize_t mergeable_rx_buffer_size_show(struct netdev_rx_queue *queue,

		struct rx_queue_attribute *attribute, char *buf)

		char *buf)

{

	struct virtnet_info *vi = netdev_priv(queue->dev);

	unsigned int queue_index = get_netdev_rx_queue_index(queue);

include/linux/netdevice.h

+2 −3
Original line number Diff line number Diff line
@@ -694,10 +694,9 @@ struct netdev_rx_queue { 
 */

struct rx_queue_attribute {

	struct attribute attr;

	ssize_t (*show)(struct netdev_rx_queue *queue,

	    struct rx_queue_attribute *attr, char *buf);

	ssize_t (*show)(struct netdev_rx_queue *queue, char *buf);

	ssize_t (*store)(struct netdev_rx_queue *queue,

	    struct rx_queue_attribute *attr, const char *buf, size_t len);

			 const char *buf, size_t len);

};



#ifdef CONFIG_XPS

net/core/net-sysfs.c

+11 −26
Original line number Diff line number Diff line
@@ -661,7 +661,7 @@ static ssize_t rx_queue_attr_show(struct kobject *kobj, struct attribute *attr, 
	if (!attribute->show)

		return -EIO;



	return attribute->show(queue, attribute, buf);

	return attribute->show(queue, buf);

}



static ssize_t rx_queue_attr_store(struct kobject *kobj, struct attribute *attr,
@@ -673,7 +673,7 @@ static ssize_t rx_queue_attr_store(struct kobject *kobj, struct attribute *attr, 
	if (!attribute->store)

		return -EIO;



	return attribute->store(queue, attribute, buf, count);

	return attribute->store(queue, buf, count);

}



static const struct sysfs_ops rx_queue_sysfs_ops = {
@@ -682,8 +682,7 @@ static const struct sysfs_ops rx_queue_sysfs_ops = { 
};



#ifdef CONFIG_RPS

static ssize_t show_rps_map(struct netdev_rx_queue *queue,

			    struct rx_queue_attribute *attribute, char *buf)

static ssize_t show_rps_map(struct netdev_rx_queue *queue, char *buf)

{

	struct rps_map *map;

	cpumask_var_t mask;
@@ -706,7 +705,6 @@ static ssize_t show_rps_map(struct netdev_rx_queue *queue, 
}



static ssize_t store_rps_map(struct netdev_rx_queue *queue,

		      struct rx_queue_attribute *attribute,

			     const char *buf, size_t len)

{

	struct rps_map *old_map, *map;
@@ -765,7 +763,6 @@ static ssize_t store_rps_map(struct netdev_rx_queue *queue, 
}



static ssize_t show_rps_dev_flow_table_cnt(struct netdev_rx_queue *queue,

					   struct rx_queue_attribute *attr,

					   char *buf)

{

	struct rps_dev_flow_table *flow_table;
@@ -788,7 +785,6 @@ static void rps_dev_flow_table_release(struct rcu_head *rcu) 
}



static ssize_t store_rps_dev_flow_table_cnt(struct netdev_rx_queue *queue,

				     struct rx_queue_attribute *attr,

					    const char *buf, size_t len)

{

	unsigned long mask, count;
@@ -975,10 +971,9 @@ net_rx_queue_update_kobjects(struct net_device *dev, int old_num, int new_num) 
 */

struct netdev_queue_attribute {

	struct attribute attr;

	ssize_t (*show)(struct netdev_queue *queue,

	    struct netdev_queue_attribute *attr, char *buf);

	ssize_t (*show)(struct netdev_queue *queue, char *buf);

	ssize_t (*store)(struct netdev_queue *queue,

	    struct netdev_queue_attribute *attr, const char *buf, size_t len);

			 const char *buf, size_t len);

};

#define to_netdev_queue_attr(_attr) container_of(_attr,		\

    struct netdev_queue_attribute, attr)
@@ -994,7 +989,7 @@ static ssize_t netdev_queue_attr_show(struct kobject *kobj, 
	if (!attribute->show)

		return -EIO;



	return attribute->show(queue, attribute, buf);

	return attribute->show(queue, buf);

}



static ssize_t netdev_queue_attr_store(struct kobject *kobj,
@@ -1007,7 +1002,7 @@ static ssize_t netdev_queue_attr_store(struct kobject *kobj, 
	if (!attribute->store)

		return -EIO;



	return attribute->store(queue, attribute, buf, count);

	return attribute->store(queue, buf, count);

}



static const struct sysfs_ops netdev_queue_sysfs_ops = {
@@ -1016,7 +1011,6 @@ static const struct sysfs_ops netdev_queue_sysfs_ops = { 
};



static ssize_t show_trans_timeout(struct netdev_queue *queue,

				  struct netdev_queue_attribute *attribute,

				  char *buf)

{

	unsigned long trans_timeout;
@@ -1040,7 +1034,6 @@ static unsigned int get_netdev_queue_index(struct netdev_queue *queue) 
}



static ssize_t show_traffic_class(struct netdev_queue *queue,

				  struct netdev_queue_attribute *attribute,

				  char *buf)

{

	struct net_device *dev = queue->dev;
@@ -1055,14 +1048,12 @@ static ssize_t show_traffic_class(struct netdev_queue *queue, 


#ifdef CONFIG_XPS

static ssize_t show_tx_maxrate(struct netdev_queue *queue,

			       struct netdev_queue_attribute *attribute,

			       char *buf)

{

	return sprintf(buf, "%lu\n", queue->tx_maxrate);

}



static ssize_t set_tx_maxrate(struct netdev_queue *queue,

			      struct netdev_queue_attribute *attribute,

			      const char *buf, size_t len)

{

	struct net_device *dev = queue->dev;
@@ -1130,7 +1121,6 @@ static ssize_t bql_set(const char *buf, const size_t count, 
}



static ssize_t bql_show_hold_time(struct netdev_queue *queue,

				  struct netdev_queue_attribute *attr,

				  char *buf)

{

	struct dql *dql = &queue->dql;
@@ -1139,7 +1129,6 @@ static ssize_t bql_show_hold_time(struct netdev_queue *queue, 
}



static ssize_t bql_set_hold_time(struct netdev_queue *queue,

				 struct netdev_queue_attribute *attribute,

				 const char *buf, size_t len)

{

	struct dql *dql = &queue->dql;
@@ -1160,7 +1149,6 @@ static struct netdev_queue_attribute bql_hold_time_attribute = 
	    bql_set_hold_time);



static ssize_t bql_show_inflight(struct netdev_queue *queue,

				 struct netdev_queue_attribute *attr,

				 char *buf)

{

	struct dql *dql = &queue->dql;
@@ -1173,14 +1161,12 @@ static struct netdev_queue_attribute bql_inflight_attribute = 


#define BQL_ATTR(NAME, FIELD)						\

static ssize_t bql_show_ ## NAME(struct netdev_queue *queue,		\

				 struct netdev_queue_attribute *attr,	\

				 char *buf)				\

{									\

	return bql_show(buf, queue->dql.FIELD);				\

}									\

									\

static ssize_t bql_set_ ## NAME(struct netdev_queue *queue,		\

				struct netdev_queue_attribute *attr,	\

				const char *buf, size_t len)		\

{									\

	return bql_set(buf, len, &queue->dql.FIELD);			\
@@ -1211,7 +1197,7 @@ static const struct attribute_group dql_group = { 


#ifdef CONFIG_XPS

static ssize_t show_xps_map(struct netdev_queue *queue,

			    struct netdev_queue_attribute *attribute, char *buf)

			    char *buf)

{

	struct net_device *dev = queue->dev;

	int cpu, len, num_tc = 1, tc = 0;
@@ -1258,7 +1244,6 @@ static ssize_t show_xps_map(struct netdev_queue *queue, 
}



static ssize_t store_xps_map(struct netdev_queue *queue,

		      struct netdev_queue_attribute *attribute,

			     const char *buf, size_t len)

{

	struct net_device *dev = queue->dev;