Skip to content

Commit

Permalink
staging: ft1000: Fix coding style.
Browse files Browse the repository at this point in the history
Fix coding style in ft1000CleanupProc and ft1000InitProc
functions.

Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Marek Belisko authored and Greg Kroah-Hartman committed Dec 10, 2010
1 parent 5fd866f commit 04c6620
Showing 1 changed file with 12 additions and 13 deletions.
25 changes: 12 additions & 13 deletions drivers/staging/ft1000/ft1000-usb/ft1000_proc.c
Original file line number Diff line number Diff line change
Expand Up @@ -196,29 +196,31 @@ static struct notifier_block ft1000_netdev_notifier = {
int ft1000InitProc(struct net_device *dev)
{
struct ft1000_info *info;
struct proc_dir_entry *ft1000_proc_file;
struct proc_dir_entry *ft1000_proc_file;
int ret = 0;

info = netdev_priv(dev);

info->ft1000_proc_dir = proc_mkdir (FT1000_PROC_DIR, FTNET_PROC);
info->ft1000_proc_dir = proc_mkdir(FT1000_PROC_DIR, FTNET_PROC);
if (info->ft1000_proc_dir == NULL) {
printk(KERN_WARNING "Unable to create %s dir.\n",
FT1000_PROC_DIR);
ret = -EINVAL;
goto fail;
}

ft1000_proc_file =
create_proc_read_entry (dev->name, 0644, info->ft1000_proc_dir,
ft1000ReadProc, dev);
ft1000_proc_file =
create_proc_read_entry(dev->name, 0644,
info->ft1000_proc_dir, ft1000ReadProc, dev);

if (ft1000_proc_file == NULL) {
printk(KERN_WARNING "Unable to create /proc entry.\n");
ret = -EINVAL;
goto fail_entry;
}

snprintf (info->netdevname, IFNAMSIZ, "%s", dev->name);
snprintf(info->netdevname, IFNAMSIZ, "%s", dev->name);

ret = register_netdevice_notifier(&ft1000_netdev_notifier);
if (ret)
goto fail_notif;
Expand All @@ -233,12 +235,9 @@ int ft1000InitProc(struct net_device *dev)
return ret;
}

void
ft1000CleanupProc(struct ft1000_info *info)
void ft1000CleanupProc(struct ft1000_info *info)
{
remove_proc_entry (info->netdevname, info->ft1000_proc_dir);
remove_proc_entry (FT1000_PROC_DIR, FTNET_PROC);
unregister_netdevice_notifier (&ft1000_netdev_notifier);

return;
remove_proc_entry(info->netdevname, info->ft1000_proc_dir);
remove_proc_entry(FT1000_PROC_DIR, FTNET_PROC);
unregister_netdevice_notifier(&ft1000_netdev_notifier);
}

0 comments on commit 04c6620

Please sign in to comment.