Skip to content

W
wr-switch-sw
Commit 7067fecc authored by Alessandro Rubini's avatar Alessandro Rubini Committed by Adam Wujek
Browse files
Options

kernel/wr_pstats: simplify a little 

Signed-off-by: Alessandro Rubini's avatarAlessandro Rubini <rubini@gnudd.com>
parent d98c8d36
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 16 deletions
kernel/wr_pstats/wr_pstats.c
View file @ 7067fecc
...@@ -243,17 +243,18 @@ static int pstats_desc_handler(ctl_table *ctl, int write, void *buffer, ...@@ -243,17 +243,18 @@ static int pstats_desc_handler(ctl_table *ctl, int write, void *buffer,
unsigned int data; unsigned int data;
unsigned int version; unsigned int version;
if (!write) { if (write) /* write not supported */
/* get version number */ return 0;
data = pstats_readl(pstats_dev, INFO);
version = PSTATS_INFO_VER_R(data);
if (version >= PSTATS_NAMES_ARRAY_SIZE) {
version = 0;
}
ctl->data = (void *)pstats_names[version]; /* get version number */
ctl->maxlen = strlen(pstats_names[version]); data = pstats_readl(pstats_dev, INFO);
version = PSTATS_INFO_VER_R(data);
if (version >= PSTATS_NAMES_ARRAY_SIZE) {
version = 0;
} }
ctl->data = (void *)pstats_names[version];
ctl->maxlen = strlen(pstats_names[version]);
return proc_dostring(ctl, 0, buffer, lenp, ppos); return proc_dostring(ctl, 0, buffer, lenp, ppos);
} }
...@@ -261,14 +262,16 @@ static int pstats_desc_handler(ctl_table *ctl, int write, void *buffer, ...@@ -261,14 +262,16 @@ static int pstats_desc_handler(ctl_table *ctl, int write, void *buffer,
static int pstats_handler(ctl_table *ctl, int write, void *buffer, static int pstats_handler(ctl_table *ctl, int write, void *buffer,
size_t *lenp, loff_t *ppos) size_t *lenp, loff_t *ppos)
{ {
int ret;
int port; int port;
unsigned int data; uint32_t int data;
if (write) /* write not supported */
return 0;
port = (int)ctl->extra1; port = (int)ctl->extra1;
if (port < pstats_nports && !write) { if (port < pstats_nports) {
pstats_rd_cntrs(port); pstats_rd_cntrs(port);
} else if (!write) { } else {
/* read stuff for info file */ /* read stuff for info file */
data = pstats_readl(pstats_dev, INFO); data = pstats_readl(pstats_dev, INFO);
pstats_info[PINFO_VER] = PSTATS_INFO_VER_R(data); pstats_info[PINFO_VER] = PSTATS_INFO_VER_R(data);
...@@ -276,9 +279,7 @@ static int pstats_handler(ctl_table *ctl, int write, void *buffer, ...@@ -276,9 +279,7 @@ static int pstats_handler(ctl_table *ctl, int write, void *buffer,
pstats_info[PINFO_CNTPP] = PSTATS_INFO_CPP_R(data); pstats_info[PINFO_CNTPP] = PSTATS_INFO_CPP_R(data);
} }
ret = proc_dointvec(ctl, 0, buffer, lenp, ppos); return_dointvec(ctl, 0, buffer, lenp, ppos);
return ret;
} }
static ctl_table pstats_ctl_table[21]; /* initialized in _init function */ static ctl_table pstats_ctl_table[21]; /* initialized in _init function */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment