aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
diff options
context:
space:
mode:
authorMarek Belisko <marek.belisko@open-nandra.com>2011-03-10 11:51:23 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2011-03-14 11:51:17 -0700
commit05a7c39c36cdfb68ddbfc417bd461755ec32e258 (patch)
tree920ed59ef370d02f527d20b4ac88c7b05397e10e /drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
parentf135da03597e8ff5a47ab3eff5aeaab2171d95ba (diff)
downloadkernel_samsung_smdk4412-05a7c39c36cdfb68ddbfc417bd461755ec32e258.zip
kernel_samsung_smdk4412-05a7c39c36cdfb68ddbfc417bd461755ec32e258.tar.gz
kernel_samsung_smdk4412-05a7c39c36cdfb68ddbfc417bd461755ec32e258.tar.bz2
staging: ft1000: Fix coding style in reg_ft1000_netdev function.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/ft1000/ft1000-usb/ft1000_hw.c')
-rw-r--r--drivers/staging/ft1000/ft1000-usb/ft1000_hw.c40
1 files changed, 18 insertions, 22 deletions
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
index 55998ec..0b8ff3d 100644
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
@@ -848,38 +848,34 @@ err_net:
// 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;
}