Commit 6648c65e authored by stephen hemminger's avatar stephen hemminger Committed by David S. Miller
Browse files

net: style cleanups 



Make code closer to current style. Mostly whitespace changes.

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

net/core/net-sysfs.c

+36 −32
Original line number Diff line number Diff line
@@ -97,7 +97,8 @@ static ssize_t netdev_store(struct device *dev, struct device_attribute *attr, 
		return restart_syscall();



	if (dev_isalive(netdev)) {

		if ((ret = (*set)(netdev, new)) == 0)

		ret = (*set)(netdev, new);

		if (ret == 0)

			ret = len;

	}

	rtnl_unlock();
@@ -160,6 +161,7 @@ static ssize_t broadcast_show(struct device *dev, 
			      struct device_attribute *attr, char *buf)

{

	struct net_device *ndev = to_net_dev(dev);



	if (dev_isalive(ndev))

		return sysfs_format_mac(buf, ndev->broadcast, ndev->addr_len);

	return -EINVAL;
@@ -183,9 +185,10 @@ static ssize_t carrier_show(struct device *dev, 
			    struct device_attribute *attr, char *buf)

{

	struct net_device *netdev = to_net_dev(dev);

	if (netif_running(netdev)) {



	if (netif_running(netdev))

		return sprintf(buf, fmt_dec, !!netif_carrier_ok(netdev));

	}



	return -EINVAL;

}

static DEVICE_ATTR_RW(carrier);
@@ -290,6 +293,7 @@ static ssize_t carrier_changes_show(struct device *dev, 
				    char *buf)

{

	struct net_device *netdev = to_net_dev(dev);



	return sprintf(buf, fmt_dec,

		       atomic_read(&netdev->carrier_changes));

}
@@ -625,7 +629,6 @@ static struct attribute *netstat_attrs[] __ro_after_init = { 
	NULL

};





static const struct attribute_group netstat_group = {

	.name  = "statistics",

	.attrs  = netstat_attrs,
@@ -647,8 +650,8 @@ static const struct attribute_group wireless_group = { 
#endif /* CONFIG_SYSFS */



#ifdef CONFIG_SYSFS

#define to_rx_queue_attr(_attr) container_of(_attr,		\

    struct rx_queue_attribute, attr)

#define to_rx_queue_attr(_attr) \

	container_of(_attr, struct rx_queue_attribute, attr)



#define to_rx_queue(obj) container_of(obj, struct netdev_rx_queue, kobj)
@@ -736,9 +739,9 @@ static ssize_t store_rps_map(struct netdev_rx_queue *queue, 
	for_each_cpu_and(cpu, mask, cpu_online_mask)

		map->cpus[i++] = cpu;



	if (i)

	if (i) {

		map->len = i;

	else {

	} else {

		kfree(map);

		map = NULL;

	}
@@ -827,8 +830,9 @@ static ssize_t store_rps_dev_flow_table_cnt(struct netdev_rx_queue *queue, 
		table->mask = mask;

		for (count = 0; count <= mask; count++)

			table->flows[count].cpu = RPS_NO_CPU;

	} else

	} else {

		table = NULL;

	}



	spin_lock(&rps_dev_flow_lock);

	old_table = rcu_dereference_protected(queue->rps_flow_table,
@@ -865,7 +869,6 @@ static void rx_queue_release(struct kobject *kobj) 
	struct rps_map *map;

	struct rps_dev_flow_table *flow_table;





	map = rcu_dereference_protected(queue->rps_map, 1);

	if (map) {

		RCU_INIT_POINTER(queue->rps_map, NULL);
@@ -974,8 +977,8 @@ struct netdev_queue_attribute { 
	ssize_t (*store)(struct netdev_queue *queue,

			 const char *buf, size_t len);

};

#define to_netdev_queue_attr(_attr) container_of(_attr,		\

    struct netdev_queue_attribute, attr)

#define to_netdev_queue_attr(_attr) \

	container_of(_attr, struct netdev_queue_attribute, attr)



#define to_netdev_queue(obj) container_of(obj, struct netdev_queue, kobj)
@@ -1104,9 +1107,9 @@ static ssize_t bql_set(const char *buf, const size_t count, 
	unsigned int value;

	int err;



	if (!strcmp(buf, "max") || !strcmp(buf, "max\n"))

	if (!strcmp(buf, "max") || !strcmp(buf, "max\n")) {

		value = DQL_MAX_LIMIT;

	else {

	} else {

		err = kstrtouint(buf, 10, &value);

		if (err < 0)

			return err;
@@ -1467,7 +1470,8 @@ static int netdev_uevent(struct device *d, struct kobj_uevent_env *env) 


	/* pass ifindex to uevent.

	 * ifindex is useful as it won't change (interface name may change)

	 * and is what RtNetlink uses natively. */

	 * and is what RtNetlink uses natively.

	 */

	retval = add_uevent_var(env, "IFINDEX=%d", dev->ifindex);



exit:
@@ -1542,7 +1546,7 @@ EXPORT_SYMBOL(of_find_net_device_by_node); 
 */

void netdev_unregister_kobject(struct net_device *ndev)

{

	struct device *dev = &(ndev->dev);

	struct device *dev = &ndev->dev;



	if (!atomic_read(&dev_net(ndev)->count))

		dev_set_uevent_suppress(dev, 1);
@@ -1559,7 +1563,7 @@ void netdev_unregister_kobject(struct net_device *ndev) 
/* Create sysfs entries for network device. */

int netdev_register_kobject(struct net_device *ndev)

{

	struct device *dev = &(ndev->dev);

	struct device *dev = &ndev->dev;

	const struct attribute_group **groups = ndev->sysfs_groups;

	int error = 0;