Commit 86fe2f8a authored by YueHaibing's avatar YueHaibing Committed by David S. Miller
Browse files

net: cdc_ncm: use DEVICE_ATTR_RW macro 



Use DEVICE_ATTR_RW helper instead of plain DEVICE_ATTR,
which makes the code a bit shorter and easier to read.

Signed-off-by: default avatarYueHaibing <yuehaibing@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7567d603

drivers/net/usb/cdc_ncm.c

+24 −12
Original line number Diff line number Diff line
@@ -192,7 +192,8 @@ static u32 cdc_ncm_check_tx_max(struct usbnet *dev, u32 new_tx) 
	return val;

}



static ssize_t cdc_ncm_show_min_tx_pkt(struct device *d, struct device_attribute *attr, char *buf)

static ssize_t min_tx_pkt_show(struct device *d,

			       struct device_attribute *attr, char *buf)

{

	struct usbnet *dev = netdev_priv(to_net_dev(d));

	struct cdc_ncm_ctx *ctx = (struct cdc_ncm_ctx *)dev->data[0];
@@ -200,7 +201,8 @@ static ssize_t cdc_ncm_show_min_tx_pkt(struct device *d, struct device_attribute 
	return sprintf(buf, "%u\n", ctx->min_tx_pkt);

}



static ssize_t cdc_ncm_show_rx_max(struct device *d, struct device_attribute *attr, char *buf)

static ssize_t rx_max_show(struct device *d,

			   struct device_attribute *attr, char *buf)

{

	struct usbnet *dev = netdev_priv(to_net_dev(d));

	struct cdc_ncm_ctx *ctx = (struct cdc_ncm_ctx *)dev->data[0];
@@ -208,7 +210,8 @@ static ssize_t cdc_ncm_show_rx_max(struct device *d, struct device_attribute *at 
	return sprintf(buf, "%u\n", ctx->rx_max);

}



static ssize_t cdc_ncm_show_tx_max(struct device *d, struct device_attribute *attr, char *buf)

static ssize_t tx_max_show(struct device *d,

			   struct device_attribute *attr, char *buf)

{

	struct usbnet *dev = netdev_priv(to_net_dev(d));

	struct cdc_ncm_ctx *ctx = (struct cdc_ncm_ctx *)dev->data[0];
@@ -216,7 +219,8 @@ static ssize_t cdc_ncm_show_tx_max(struct device *d, struct device_attribute *at 
	return sprintf(buf, "%u\n", ctx->tx_max);

}



static ssize_t cdc_ncm_show_tx_timer_usecs(struct device *d, struct device_attribute *attr, char *buf)

static ssize_t tx_timer_usecs_show(struct device *d,

				   struct device_attribute *attr, char *buf)

{

	struct usbnet *dev = netdev_priv(to_net_dev(d));

	struct cdc_ncm_ctx *ctx = (struct cdc_ncm_ctx *)dev->data[0];
@@ -224,7 +228,9 @@ static ssize_t cdc_ncm_show_tx_timer_usecs(struct device *d, struct device_attri 
	return sprintf(buf, "%u\n", ctx->timer_interval / (u32)NSEC_PER_USEC);

}



static ssize_t cdc_ncm_store_min_tx_pkt(struct device *d,  struct device_attribute *attr, const char *buf, size_t len)

static ssize_t min_tx_pkt_store(struct device *d,

				struct device_attribute *attr,

				const char *buf, size_t len)

{

	struct usbnet *dev = netdev_priv(to_net_dev(d));

	struct cdc_ncm_ctx *ctx = (struct cdc_ncm_ctx *)dev->data[0];
@@ -238,7 +244,9 @@ static ssize_t cdc_ncm_store_min_tx_pkt(struct device *d, struct device_attribu 
	return len;

}



static ssize_t cdc_ncm_store_rx_max(struct device *d,  struct device_attribute *attr, const char *buf, size_t len)

static ssize_t rx_max_store(struct device *d,

			    struct device_attribute *attr,

			    const char *buf, size_t len)

{

	struct usbnet *dev = netdev_priv(to_net_dev(d));

	struct cdc_ncm_ctx *ctx = (struct cdc_ncm_ctx *)dev->data[0];
@@ -251,7 +259,9 @@ static ssize_t cdc_ncm_store_rx_max(struct device *d, struct device_attribute * 
	return len;

}



static ssize_t cdc_ncm_store_tx_max(struct device *d,  struct device_attribute *attr, const char *buf, size_t len)

static ssize_t tx_max_store(struct device *d,

			    struct device_attribute *attr,

			    const char *buf, size_t len)

{

	struct usbnet *dev = netdev_priv(to_net_dev(d));

	struct cdc_ncm_ctx *ctx = (struct cdc_ncm_ctx *)dev->data[0];
@@ -264,7 +274,9 @@ static ssize_t cdc_ncm_store_tx_max(struct device *d, struct device_attribute * 
	return len;

}



static ssize_t cdc_ncm_store_tx_timer_usecs(struct device *d,  struct device_attribute *attr, const char *buf, size_t len)

static ssize_t tx_timer_usecs_store(struct device *d,

				    struct device_attribute *attr,

				    const char *buf, size_t len)

{

	struct usbnet *dev = netdev_priv(to_net_dev(d));

	struct cdc_ncm_ctx *ctx = (struct cdc_ncm_ctx *)dev->data[0];
@@ -285,10 +297,10 @@ static ssize_t cdc_ncm_store_tx_timer_usecs(struct device *d, struct device_att 
	return len;

}



static DEVICE_ATTR(min_tx_pkt, 0644, cdc_ncm_show_min_tx_pkt, cdc_ncm_store_min_tx_pkt);

static DEVICE_ATTR(rx_max, 0644, cdc_ncm_show_rx_max, cdc_ncm_store_rx_max);

static DEVICE_ATTR(tx_max, 0644, cdc_ncm_show_tx_max, cdc_ncm_store_tx_max);

static DEVICE_ATTR(tx_timer_usecs, 0644, cdc_ncm_show_tx_timer_usecs, cdc_ncm_store_tx_timer_usecs);

static DEVICE_ATTR_RW(min_tx_pkt);

static DEVICE_ATTR_RW(rx_max);

static DEVICE_ATTR_RW(tx_max);

static DEVICE_ATTR_RW(tx_timer_usecs);



static ssize_t ndp_to_end_show(struct device *d, struct device_attribute *attr, char *buf)

{