Skip to content

Commit

Permalink
staging: ft1000: Fix coding style in reg_ft1000_netdev function.
Browse files Browse the repository at this point in the history
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 Mar 14, 2011
1 parent f135da0 commit 05a7c39
Showing 1 changed file with 18 additions and 22 deletions.
40 changes: 18 additions & 22 deletions drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
Original file line number Diff line number Diff line change
Expand Up @@ -848,38 +848,34 @@ int init_ft1000_netdev(struct ft1000_device *ft1000dev)
// Notes:
//
//---------------------------------------------------------------------------
int reg_ft1000_netdev(struct ft1000_device *ft1000dev, struct usb_interface *intf)
int reg_ft1000_netdev(struct ft1000_device *ft1000dev,
struct usb_interface *intf)
{
struct net_device *netdev;
struct net_device *netdev;
struct ft1000_info *pInfo;
int rc;

netdev = ft1000dev->net;
pInfo = netdev_priv(ft1000dev->net);
DEBUG("Enter reg_ft1000_netdev...\n");

netdev = ft1000dev->net;
pInfo = netdev_priv(ft1000dev->net);
DEBUG("Enter reg_ft1000_netdev...\n");

ft1000_read_register(ft1000dev, &pInfo->AsicID, FT1000_REG_ASIC_ID);
ft1000_read_register(ft1000dev, &pInfo->AsicID, FT1000_REG_ASIC_ID);

usb_set_intfdata(intf, pInfo);
SET_NETDEV_DEV(netdev, &intf->dev);
usb_set_intfdata(intf, pInfo);
SET_NETDEV_DEV(netdev, &intf->dev);

rc = register_netdev(netdev);
if (rc)
{
DEBUG("reg_ft1000_netdev: could not register network device\n");
free_netdev(netdev);
return rc;
}


//Create character device, implemented by Jim
ft1000_create_dev(ft1000dev);
rc = register_netdev(netdev);
if (rc) {
DEBUG("reg_ft1000_netdev: could not register network device\n");
free_netdev(netdev);
return rc;
}

DEBUG ("reg_ft1000_netdev returned\n");
ft1000_create_dev(ft1000dev);

pInfo->CardReady = 1;
DEBUG("reg_ft1000_netdev returned\n");

pInfo->CardReady = 1;

return 0;
}
Expand Down

0 comments on commit 05a7c39

Please sign in to comment.