lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: ft1000: Fix coding style in reg_ft1000_netdev function.

Browse Source 
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Marek Belisko
2011-03-10 11:51:23 +01:00
committed by Greg Kroah-Hartman
parent f135da0359
commit 05a7c39c36
1 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
View File

@@ -848,7 +848,8 @@ err_net:
// Notes: // 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; struct ft1000_info *pInfo;
@@ -858,29 +859,24 @@ int reg_ft1000_netdev(struct ft1000_device *ft1000dev, struct usb_interface *int
pInfo = netdev_priv(ft1000dev->net); pInfo = netdev_priv(ft1000dev->net);
DEBUG("Enter reg_ft1000_netdev...\n"); 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); usb_set_intfdata(intf, pInfo);
SET_NETDEV_DEV(netdev, &intf->dev); SET_NETDEV_DEV(netdev, &intf->dev);
rc = register_netdev(netdev); rc = register_netdev(netdev);
if (rc) if (rc) {
{
DEBUG("reg_ft1000_netdev: could not register network device\n"); DEBUG("reg_ft1000_netdev: could not register network device\n");
free_netdev(netdev); free_netdev(netdev);
return rc; return rc;
} }
//Create character device, implemented by Jim
ft1000_create_dev(ft1000dev); ft1000_create_dev(ft1000dev);
DEBUG("reg_ft1000_netdev returned\n"); DEBUG("reg_ft1000_netdev returned\n");
pInfo->CardReady = 1; pInfo->CardReady = 1;
return 0; return 0;
} }