redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

net: drop unused attribute argument from sysfs queue funcs 

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

Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
zero-colors
stephen hemminger 2017-08-18 13:46:24 -07:00 committed by David S. Miller
parent ec6cc5993c
commit 718ad681ef
3 changed files with 14 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/virtio_net.c
View File

@ -2376,7 +2376,7 @@ err:
#ifdef CONFIG_SYSFS #ifdef CONFIG_SYSFS
static ssize_t mergeable_rx_buffer_size_show(struct netdev_rx_queue *queue, 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); struct virtnet_info *vi = netdev_priv(queue->dev);
unsigned int queue_index = get_netdev_rx_queue_index(queue); unsigned int queue_index = get_netdev_rx_queue_index(queue);

5
include/linux/netdevice.h
View File

@ -694,10 +694,9 @@ struct netdev_rx_queue {
*/ */
struct rx_queue_attribute { struct rx_queue_attribute {
struct attribute attr; struct attribute attr;
ssize_t (*show)(struct netdev_rx_queue *queue, ssize_t (*show)(struct netdev_rx_queue *queue, char *buf);
struct rx_queue_attribute *attr, char *buf);
ssize_t (*store)(struct netdev_rx_queue *queue, 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 #ifdef CONFIG_XPS

37
net/core/net-sysfs.c
View File

@ -661,7 +661,7 @@ static ssize_t rx_queue_attr_show(struct kobject *kobj, struct attribute *attr,
if (!attribute->show) if (!attribute->show)
return -EIO; 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, 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) if (!attribute->store)
return -EIO; return -EIO;
return attribute->store(queue, attribute, buf, count); return attribute->store(queue, buf, count);
} }
static const struct sysfs_ops rx_queue_sysfs_ops = { 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 #ifdef CONFIG_RPS
static ssize_t show_rps_map(struct netdev_rx_queue *queue, static ssize_t show_rps_map(struct netdev_rx_queue *queue, char *buf)
struct rx_queue_attribute *attribute, char *buf)
{ {
struct rps_map *map; struct rps_map *map;
cpumask_var_t mask; cpumask_var_t mask;
@ -706,8 +705,7 @@ static ssize_t show_rps_map(struct netdev_rx_queue *queue,
} }
static ssize_t store_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)
const char *buf, size_t len)
{ {
struct rps_map *old_map, *map; struct rps_map *old_map, *map;
cpumask_var_t mask; cpumask_var_t mask;
@ -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, static ssize_t show_rps_dev_flow_table_cnt(struct netdev_rx_queue *queue,
struct rx_queue_attribute *attr,
char *buf) char *buf)
{ {
struct rps_dev_flow_table *flow_table; struct rps_dev_flow_table *flow_table;
@ -788,8 +785,7 @@ 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, 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)
const char *buf, size_t len)
{ {
unsigned long mask, count; unsigned long mask, count;
struct rps_dev_flow_table *table, *old_table; struct rps_dev_flow_table *table, *old_table;
@ -975,10 +971,9 @@ net_rx_queue_update_kobjects(struct net_device *dev, int old_num, int new_num)
*/ */
struct netdev_queue_attribute { struct netdev_queue_attribute {
struct attribute attr; struct attribute attr;
ssize_t (*show)(struct netdev_queue *queue, ssize_t (*show)(struct netdev_queue *queue, char *buf);
struct netdev_queue_attribute *attr, char *buf);
ssize_t (*store)(struct netdev_queue *queue, 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, \ #define to_netdev_queue_attr(_attr) container_of(_attr, \
struct netdev_queue_attribute, attr) struct netdev_queue_attribute, attr)
@ -994,7 +989,7 @@ static ssize_t netdev_queue_attr_show(struct kobject *kobj,
if (!attribute->show) if (!attribute->show)
return -EIO; return -EIO;
return attribute->show(queue, attribute, buf); return attribute->show(queue, buf);
} }
static ssize_t netdev_queue_attr_store(struct kobject *kobj, 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) if (!attribute->store)
return -EIO; return -EIO;
return attribute->store(queue, attribute, buf, count); return attribute->store(queue, buf, count);
} }
static const struct sysfs_ops netdev_queue_sysfs_ops = { 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, static ssize_t show_trans_timeout(struct netdev_queue *queue,
struct netdev_queue_attribute *attribute,
char *buf) char *buf)
{ {
unsigned long trans_timeout; 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, static ssize_t show_traffic_class(struct netdev_queue *queue,
struct netdev_queue_attribute *attribute,
char *buf) char *buf)
{ {
struct net_device *dev = queue->dev; struct net_device *dev = queue->dev;
@ -1055,14 +1048,12 @@ static ssize_t show_traffic_class(struct netdev_queue *queue,
#ifdef CONFIG_XPS #ifdef CONFIG_XPS
static ssize_t show_tx_maxrate(struct netdev_queue *queue, static ssize_t show_tx_maxrate(struct netdev_queue *queue,
struct netdev_queue_attribute *attribute,
char *buf) char *buf)
{ {
return sprintf(buf, "%lu\n", queue->tx_maxrate); return sprintf(buf, "%lu\n", queue->tx_maxrate);
} }
static ssize_t set_tx_maxrate(struct netdev_queue *queue, static ssize_t set_tx_maxrate(struct netdev_queue *queue,
struct netdev_queue_attribute *attribute,
const char *buf, size_t len) const char *buf, size_t len)
{ {
struct net_device *dev = queue->dev; 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, static ssize_t bql_show_hold_time(struct netdev_queue *queue,
struct netdev_queue_attribute *attr,
char *buf) char *buf)
{ {
struct dql *dql = &queue->dql; 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, static ssize_t bql_set_hold_time(struct netdev_queue *queue,
struct netdev_queue_attribute *attribute,
const char *buf, size_t len) const char *buf, size_t len)
{ {
struct dql *dql = &queue->dql; struct dql *dql = &queue->dql;
@ -1160,7 +1149,6 @@ static struct netdev_queue_attribute bql_hold_time_attribute =
bql_set_hold_time); bql_set_hold_time);
static ssize_t bql_show_inflight(struct netdev_queue *queue, static ssize_t bql_show_inflight(struct netdev_queue *queue,
struct netdev_queue_attribute *attr,
char *buf) char *buf)
{ {
struct dql *dql = &queue->dql; struct dql *dql = &queue->dql;
@ -1173,14 +1161,12 @@ static struct netdev_queue_attribute bql_inflight_attribute =
#define BQL_ATTR(NAME, FIELD) \ #define BQL_ATTR(NAME, FIELD) \
static ssize_t bql_show_ ## NAME(struct netdev_queue *queue, \ static ssize_t bql_show_ ## NAME(struct netdev_queue *queue, \
struct netdev_queue_attribute *attr, \
char *buf) \ char *buf) \
{ \ { \
return bql_show(buf, queue->dql.FIELD); \ return bql_show(buf, queue->dql.FIELD); \
} \ } \
\ \
static ssize_t bql_set_ ## NAME(struct netdev_queue *queue, \ static ssize_t bql_set_ ## NAME(struct netdev_queue *queue, \
struct netdev_queue_attribute *attr, \
const char *buf, size_t len) \ const char *buf, size_t len) \
{ \ { \
return bql_set(buf, len, &queue->dql.FIELD); \ return bql_set(buf, len, &queue->dql.FIELD); \
@ -1211,7 +1197,7 @@ static const struct attribute_group dql_group = {
#ifdef CONFIG_XPS #ifdef CONFIG_XPS
static ssize_t show_xps_map(struct netdev_queue *queue, 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; struct net_device *dev = queue->dev;
int cpu, len, num_tc = 1, tc = 0; int cpu, len, num_tc = 1, tc = 0;
@ -1258,8 +1244,7 @@ static ssize_t show_xps_map(struct netdev_queue *queue,
} }
static ssize_t store_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)
const char *buf, size_t len)
{ {
struct net_device *dev = queue->dev; struct net_device *dev = queue->dev;
unsigned long index; unsigned long index;