Re: [PATCH 2/4] staging: rtl8188eu: rtw_debug.c
On Fri, Aug 22, 2014 at 11:33:20AM +0100, Miguel Oliveira wrote: > Convert all rtw_proc_xxx references to rtw_sys_xxx Again, your subject: is not understandable. And what are you doing here? > Code with 62 WARNING: line over 80 characters, I'll write another patch > to clean the whole file. What do you mean by this? Why refer to a future patch in this changelog, that doesn't help anyone. confused, greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 2/4] staging: rtl8188eu: rtw_debug.c
On Fri, Aug 22, 2014 at 11:33:20AM +0100, Miguel Oliveira wrote: Convert all rtw_proc_xxx references to rtw_sys_xxx Again, your subject: is not understandable. And what are you doing here? Code with 62 WARNING: line over 80 characters, I'll write another patch to clean the whole file. What do you mean by this? Why refer to a future patch in this changelog, that doesn't help anyone. confused, greg k-h -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH 2/4] staging: rtl8188eu: rtw_debug.c
Convert all rtw_proc_xxx references to rtw_sys_xxx
Code with 62 WARNING: line over 80 characters, I'll write another patch
to clean the whole file.
Signed-off-by: Miguel Oliveira
---
drivers/staging/rtl8188eu/core/rtw_debug.c| 640 +
drivers/staging/rtl8188eu/include/drv_types.h |2 +-
2 files changed, 346 insertions(+), 296 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_debug.c
b/drivers/staging/rtl8188eu/core/rtw_debug.c
index 1f72f7d..f25401e 100644
--- a/drivers/staging/rtl8188eu/core/rtw_debug.c
+++ b/drivers/staging/rtl8188eu/core/rtw_debug.c
@@ -22,30 +22,26 @@
#include
#include
-int proc_get_drv_version(char *page, char **start,
- off_t offset, int count,
- int *eof, void *data)
+ssize_t sys_get_drv_version(struct file *file, char __user *buffer,
+size_t count, loff_t *offset)
{
int len = 0;
- len += snprintf(page + len, count - len, "%s\n", DRIVERVERSION);
+ if (*offset != 0)
+ return 0;
+
+ len += snprintf(buffer + len, count - len, "%s\n", DRIVERVERSION);
+ *offset = len;
- *eof = 1;
return len;
}
-int proc_get_write_reg(char *page, char **start,
- off_t offset, int count,
- int *eof, void *data)
-{
- *eof = 1;
- return 0;
-}
-int proc_set_write_reg(struct file *file, const char __user *buffer,
- unsigned long count, void *data)
+ssize_t sys_set_write_reg(struct file *file, const char __user *buffer,
+ size_t count, loff_t *offset)
{
- struct net_device *dev = (struct net_device *)data;
+ struct inode *inode = file_inode(file);
+ struct net_device *dev = (struct net_device *)inode->i_private;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
char tmp[32];
u32 addr, val, len;
@@ -80,44 +76,45 @@ int proc_set_write_reg(struct file *file, const char __user
*buffer,
return count;
}
-static u32 proc_get_read_addr = 0x;
-static u32 proc_get_read_len = 0x4;
+static u32 sys_get_read_addr = 0x;
+static u32 sys_get_read_len = 0x4;
-int proc_get_read_reg(char *page, char **start,
- off_t offset, int count,
- int *eof, void *data)
+ssize_t sys_get_read_reg(struct file *file, char __user *buffer,
+ size_t count, loff_t *offset)
{
- struct net_device *dev = data;
+ struct inode *inode = file_inode(file);
+ struct net_device *dev = (struct net_device *)inode->i_private;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
-
int len = 0;
- if (proc_get_read_addr == 0x) {
- *eof = 1;
+ if (*offset != 0)
+ return 0;
+
+ if (sys_get_read_addr == 0x)
return len;
- switch (proc_get_read_len) {
+ switch (sys_get_read_len) {
case 1:
- len += snprintf(page + len, count - len,
"usb_read8(0x%x)=0x%x\n", proc_get_read_addr, usb_read8(padapter,
proc_get_read_addr));
+ len += snprintf(buffer + len, count - len,
"usb_read8(0x%x)=0x%x\n", sys_get_read_addr, usb_read8(padapter,
sys_get_read_addr));
break;
case 2:
- len += snprintf(page + len, count - len,
"usb_read16(0x%x)=0x%x\n", proc_get_read_addr, usb_read16(padapter,
proc_get_read_addr));
+ len += snprintf(buffer + len, count - len,
"usb_read16(0x%x)=0x%x\n", sys_get_read_addr, usb_read16(padapter,
sys_get_read_addr));
break;
case 4:
- len += snprintf(page + len, count - len,
"usb_read32(0x%x)=0x%x\n", proc_get_read_addr, usb_read32(padapter,
proc_get_read_addr));
+ len += snprintf(buffer + len, count - len,
"usb_read32(0x%x)=0x%x\n", sys_get_read_addr, usb_read32(padapter,
sys_get_read_addr));
break;
default:
- len += snprintf(page + len, count - len, "error read
length=%d\n", proc_get_read_len);
+ len += snprintf(buffer + len, count - len, "error read
length=%d\n", sys_get_read_len);
break;
}
- *eof = 1;
+ *offset = len;
return len;
}
-int proc_set_read_reg(struct file *file, const char __user *buffer,
- unsigned long count, void *data)
+ssize_t sys_set_read_reg(struct file *file, const char __user *buffer,
+ size_t count, loff_t *offset)
{
char tmp[16];
u32 addr, len;
@@ -135,116 +132,125 @@ int proc_set_read_reg(struct file *file, const char
__user *buffer,
return count;
}
- proc_get_read_addr = addr;
+ sys_get_read_addr = addr;
- proc_get_read_len = len;
+
[PATCH 2/4] staging: rtl8188eu: rtw_debug.c
Convert all rtw_proc_xxx references to rtw_sys_xxx
Code with 62 WARNING: line over 80 characters, I'll write another patch
to clean the whole file.
Signed-off-by: Miguel Oliveira cmro...@gmail.com
---
drivers/staging/rtl8188eu/core/rtw_debug.c| 640 +
drivers/staging/rtl8188eu/include/drv_types.h |2 +-
2 files changed, 346 insertions(+), 296 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_debug.c
b/drivers/staging/rtl8188eu/core/rtw_debug.c
index 1f72f7d..f25401e 100644
--- a/drivers/staging/rtl8188eu/core/rtw_debug.c
+++ b/drivers/staging/rtl8188eu/core/rtw_debug.c
@@ -22,30 +22,26 @@
#include rtw_debug.h
#include usb_ops_linux.h
-int proc_get_drv_version(char *page, char **start,
- off_t offset, int count,
- int *eof, void *data)
+ssize_t sys_get_drv_version(struct file *file, char __user *buffer,
+size_t count, loff_t *offset)
{
int len = 0;
- len += snprintf(page + len, count - len, %s\n, DRIVERVERSION);
+ if (*offset != 0)
+ return 0;
+
+ len += snprintf(buffer + len, count - len, %s\n, DRIVERVERSION);
+ *offset = len;
- *eof = 1;
return len;
}
-int proc_get_write_reg(char *page, char **start,
- off_t offset, int count,
- int *eof, void *data)
-{
- *eof = 1;
- return 0;
-}
-int proc_set_write_reg(struct file *file, const char __user *buffer,
- unsigned long count, void *data)
+ssize_t sys_set_write_reg(struct file *file, const char __user *buffer,
+ size_t count, loff_t *offset)
{
- struct net_device *dev = (struct net_device *)data;
+ struct inode *inode = file_inode(file);
+ struct net_device *dev = (struct net_device *)inode-i_private;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
char tmp[32];
u32 addr, val, len;
@@ -80,44 +76,45 @@ int proc_set_write_reg(struct file *file, const char __user
*buffer,
return count;
}
-static u32 proc_get_read_addr = 0x;
-static u32 proc_get_read_len = 0x4;
+static u32 sys_get_read_addr = 0x;
+static u32 sys_get_read_len = 0x4;
-int proc_get_read_reg(char *page, char **start,
- off_t offset, int count,
- int *eof, void *data)
+ssize_t sys_get_read_reg(struct file *file, char __user *buffer,
+ size_t count, loff_t *offset)
{
- struct net_device *dev = data;
+ struct inode *inode = file_inode(file);
+ struct net_device *dev = (struct net_device *)inode-i_private;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
-
int len = 0;
- if (proc_get_read_addr == 0x) {
- *eof = 1;
+ if (*offset != 0)
+ return 0;
+
+ if (sys_get_read_addr == 0x)
return len;
- switch (proc_get_read_len) {
+ switch (sys_get_read_len) {
case 1:
- len += snprintf(page + len, count - len,
usb_read8(0x%x)=0x%x\n, proc_get_read_addr, usb_read8(padapter,
proc_get_read_addr));
+ len += snprintf(buffer + len, count - len,
usb_read8(0x%x)=0x%x\n, sys_get_read_addr, usb_read8(padapter,
sys_get_read_addr));
break;
case 2:
- len += snprintf(page + len, count - len,
usb_read16(0x%x)=0x%x\n, proc_get_read_addr, usb_read16(padapter,
proc_get_read_addr));
+ len += snprintf(buffer + len, count - len,
usb_read16(0x%x)=0x%x\n, sys_get_read_addr, usb_read16(padapter,
sys_get_read_addr));
break;
case 4:
- len += snprintf(page + len, count - len,
usb_read32(0x%x)=0x%x\n, proc_get_read_addr, usb_read32(padapter,
proc_get_read_addr));
+ len += snprintf(buffer + len, count - len,
usb_read32(0x%x)=0x%x\n, sys_get_read_addr, usb_read32(padapter,
sys_get_read_addr));
break;
default:
- len += snprintf(page + len, count - len, error read
length=%d\n, proc_get_read_len);
+ len += snprintf(buffer + len, count - len, error read
length=%d\n, sys_get_read_len);
break;
}
- *eof = 1;
+ *offset = len;
return len;
}
-int proc_set_read_reg(struct file *file, const char __user *buffer,
- unsigned long count, void *data)
+ssize_t sys_set_read_reg(struct file *file, const char __user *buffer,
+ size_t count, loff_t *offset)
{
char tmp[16];
u32 addr, len;
@@ -135,116 +132,125 @@ int proc_set_read_reg(struct file *file, const char
__user *buffer,
return count;
}
- proc_get_read_addr = addr;
+ sys_get_read_addr = addr;
-
