Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 203701
b: refs/heads/master
c: 5767430
h: refs/heads/master
i:
  203699: a6b49fb
v: v3
  • Loading branch information
Joe Perches authored and John W. Linville committed Jul 14, 2010
1 parent aaeb353 commit d79ba8a
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 25 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 447a42c2feb1091f217c1d50000d8cddf39addb5
refs/heads/master: 57674308d00b5ebb639ce53d388e61728e0c7f72
22 changes: 11 additions & 11 deletions trunk/drivers/net/wireless/airo.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4657,7 +4657,7 @@ static ssize_t proc_write( struct file *file,
loff_t *offset )
{
loff_t pos = *offset;
struct proc_data *priv = (struct proc_data*)file->private_data;
struct proc_data *priv = file->private_data;

if (!priv->wbuffer)
return -EINVAL;
Expand Down Expand Up @@ -4689,7 +4689,7 @@ static int proc_status_open(struct inode *inode, struct file *file)

if ((file->private_data = kzalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL)
return -ENOMEM;
data = (struct proc_data *)file->private_data;
data = file->private_data;
if ((data->rbuffer = kmalloc( 2048, GFP_KERNEL )) == NULL) {
kfree (file->private_data);
return -ENOMEM;
Expand Down Expand Up @@ -4772,7 +4772,7 @@ static int proc_stats_rid_open( struct inode *inode,

if ((file->private_data = kzalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL)
return -ENOMEM;
data = (struct proc_data *)file->private_data;
data = file->private_data;
if ((data->rbuffer = kmalloc( 4096, GFP_KERNEL )) == NULL) {
kfree (file->private_data);
return -ENOMEM;
Expand Down Expand Up @@ -5045,7 +5045,7 @@ static int proc_config_open(struct inode *inode, struct file *file)

if ((file->private_data = kzalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL)
return -ENOMEM;
data = (struct proc_data *)file->private_data;
data = file->private_data;
if ((data->rbuffer = kmalloc( 2048, GFP_KERNEL )) == NULL) {
kfree (file->private_data);
return -ENOMEM;
Expand Down Expand Up @@ -5127,7 +5127,7 @@ static int proc_config_open(struct inode *inode, struct file *file)

static void proc_SSID_on_close(struct inode *inode, struct file *file)
{
struct proc_data *data = (struct proc_data *)file->private_data;
struct proc_data *data = file->private_data;
struct proc_dir_entry *dp = PDE(inode);
struct net_device *dev = dp->data;
struct airo_info *ai = dev->ml_priv;
Expand Down Expand Up @@ -5170,7 +5170,7 @@ static inline u8 hexVal(char c) {
}

static void proc_APList_on_close( struct inode *inode, struct file *file ) {
struct proc_data *data = (struct proc_data *)file->private_data;
struct proc_data *data = file->private_data;
struct proc_dir_entry *dp = PDE(inode);
struct net_device *dev = dp->data;
struct airo_info *ai = dev->ml_priv;
Expand Down Expand Up @@ -5316,7 +5316,7 @@ static void proc_wepkey_on_close( struct inode *inode, struct file *file ) {

memset(key, 0, sizeof(key));

data = (struct proc_data *)file->private_data;
data = file->private_data;
if ( !data->writelen ) return;

if (data->wbuffer[0] >= '0' && data->wbuffer[0] <= '3' &&
Expand Down Expand Up @@ -5370,7 +5370,7 @@ static int proc_wepkey_open( struct inode *inode, struct file *file )
if ((file->private_data = kzalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL)
return -ENOMEM;
memset(&wkr, 0, sizeof(wkr));
data = (struct proc_data *)file->private_data;
data = file->private_data;
if ((data->rbuffer = kzalloc( 180, GFP_KERNEL )) == NULL) {
kfree (file->private_data);
return -ENOMEM;
Expand Down Expand Up @@ -5416,7 +5416,7 @@ static int proc_SSID_open(struct inode *inode, struct file *file)

if ((file->private_data = kzalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL)
return -ENOMEM;
data = (struct proc_data *)file->private_data;
data = file->private_data;
if ((data->rbuffer = kmalloc( 104, GFP_KERNEL )) == NULL) {
kfree (file->private_data);
return -ENOMEM;
Expand Down Expand Up @@ -5460,7 +5460,7 @@ static int proc_APList_open( struct inode *inode, struct file *file ) {

if ((file->private_data = kzalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL)
return -ENOMEM;
data = (struct proc_data *)file->private_data;
data = file->private_data;
if ((data->rbuffer = kmalloc( 104, GFP_KERNEL )) == NULL) {
kfree (file->private_data);
return -ENOMEM;
Expand Down Expand Up @@ -5502,7 +5502,7 @@ static int proc_BSSList_open( struct inode *inode, struct file *file ) {

if ((file->private_data = kzalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL)
return -ENOMEM;
data = (struct proc_data *)file->private_data;
data = file->private_data;
if ((data->rbuffer = kmalloc( 1024, GFP_KERNEL )) == NULL) {
kfree (file->private_data);
return -ENOMEM;
Expand Down
9 changes: 3 additions & 6 deletions trunk/drivers/net/wireless/ath/ath9k/htc_drv_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -492,8 +492,7 @@ static int ath9k_debugfs_open(struct inode *inode, struct file *file)
static ssize_t read_file_tgt_stats(struct file *file, char __user *user_buf,
size_t count, loff_t *ppos)
{
struct ath9k_htc_priv *priv =
(struct ath9k_htc_priv *) file->private_data;
struct ath9k_htc_priv *priv = file->private_data;
struct ath9k_htc_target_stats cmd_rsp;
char buf[512];
unsigned int len = 0;
Expand Down Expand Up @@ -536,8 +535,7 @@ static const struct file_operations fops_tgt_stats = {
static ssize_t read_file_xmit(struct file *file, char __user *user_buf,
size_t count, loff_t *ppos)
{
struct ath9k_htc_priv *priv =
(struct ath9k_htc_priv *) file->private_data;
struct ath9k_htc_priv *priv = file->private_data;
char buf[512];
unsigned int len = 0;

Expand Down Expand Up @@ -582,8 +580,7 @@ static const struct file_operations fops_xmit = {
static ssize_t read_file_recv(struct file *file, char __user *user_buf,
size_t count, loff_t *ppos)
{
struct ath9k_htc_priv *priv =
(struct ath9k_htc_priv *) file->private_data;
struct ath9k_htc_priv *priv = file->private_data;
char buf[512];
unsigned int len = 0;

Expand Down
10 changes: 5 additions & 5 deletions trunk/drivers/net/wireless/iwlwifi/iwl-debugfs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1267,7 +1267,7 @@ static ssize_t iwl_dbgfs_ucode_tracing_read(struct file *file,
char __user *user_buf,
size_t count, loff_t *ppos) {

struct iwl_priv *priv = (struct iwl_priv *)file->private_data;
struct iwl_priv *priv = file->private_data;
int pos = 0;
char buf[128];
const size_t bufsz = sizeof(buf);
Expand Down Expand Up @@ -1317,7 +1317,7 @@ static ssize_t iwl_dbgfs_rxon_flags_read(struct file *file,
char __user *user_buf,
size_t count, loff_t *ppos) {

struct iwl_priv *priv = (struct iwl_priv *)file->private_data;
struct iwl_priv *priv = file->private_data;
int len = 0;
char buf[20];

Expand All @@ -1329,7 +1329,7 @@ static ssize_t iwl_dbgfs_rxon_filter_flags_read(struct file *file,
char __user *user_buf,
size_t count, loff_t *ppos) {

struct iwl_priv *priv = (struct iwl_priv *)file->private_data;
struct iwl_priv *priv = file->private_data;
int len = 0;
char buf[20];

Expand All @@ -1342,7 +1342,7 @@ static ssize_t iwl_dbgfs_fh_reg_read(struct file *file,
char __user *user_buf,
size_t count, loff_t *ppos)
{
struct iwl_priv *priv = (struct iwl_priv *)file->private_data;
struct iwl_priv *priv = file->private_data;
char *buf;
int pos = 0;
ssize_t ret = -EFAULT;
Expand Down Expand Up @@ -1404,7 +1404,7 @@ static ssize_t iwl_dbgfs_plcp_delta_read(struct file *file,
char __user *user_buf,
size_t count, loff_t *ppos) {

struct iwl_priv *priv = (struct iwl_priv *)file->private_data;
struct iwl_priv *priv = file->private_data;
int pos = 0;
char buf[12];
const size_t bufsz = sizeof(buf);
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/net/wireless/libertas/debugfs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -905,7 +905,7 @@ static ssize_t lbs_debugfs_read(struct file *file, char __user *userbuf,

p = buf;

d = (struct debug_data *)file->private_data;
d = file->private_data;

for (i = 0; i < num_of_items; i++) {
if (d[i].size == 1)
Expand Down Expand Up @@ -944,7 +944,7 @@ static ssize_t lbs_debugfs_write(struct file *f, const char __user *buf,
char *p0;
char *p1;
char *p2;
struct debug_data *d = (struct debug_data *)f->private_data;
struct debug_data *d = f->private_data;

pdata = kmalloc(cnt, GFP_KERNEL);
if (pdata == NULL)
Expand Down

0 comments on commit d79ba8a

Please sign in to comment.