summaryrefslogtreecommitdiffstats
path: root/drivers/net/can/softing
diff options
context:
space:
mode:
authorGreg Kroah-Hartman2012-12-06 15:30:56 +0100
committerDavid S. Miller2012-12-07 20:22:22 +0100
commit1dd06ae8db716e17ec7e06244b858606edf378c0 (patch)
treeae4116a9b029ab570a58fae5275cfbb3af6a1d64 /drivers/net/can/softing
parentsctp: Add RCU protection to assoc->transport_addr_list (diff)
downloadkernel-qcow2-linux-1dd06ae8db716e17ec7e06244b858606edf378c0.tar.gz
kernel-qcow2-linux-1dd06ae8db716e17ec7e06244b858606edf378c0.tar.xz
kernel-qcow2-linux-1dd06ae8db716e17ec7e06244b858606edf378c0.zip
drivers/net: fix up function prototypes after __dev* removals
The __dev* removal patches for the network drivers ended up messing up the function prototypes for a bunch of drivers. This patch fixes all of them back up to be properly aligned. Bonus is that this almost removes 100 lines of code, always a nice surprise. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/can/softing')
-rw-r--r--drivers/net/can/softing/softing_cs.c3
-rw-r--r--drivers/net/can/softing/softing_main.c2
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/can/softing/softing_cs.c b/drivers/net/can/softing/softing_cs.c
index ce18ba52e4b9..c2c0a5bb0b21 100644
--- a/drivers/net/can/softing/softing_cs.c
+++ b/drivers/net/can/softing/softing_cs.c
@@ -193,8 +193,7 @@ static int softingcs_enable_irq(struct platform_device *pdev, int v)
/*
* pcmcia check
*/
-static int softingcs_probe_config(struct pcmcia_device *pcmcia,
- void *priv_data)
+static int softingcs_probe_config(struct pcmcia_device *pcmcia, void *priv_data)
{
struct softing_platform_data *pdat = priv_data;
struct resource *pres;
diff --git a/drivers/net/can/softing/softing_main.c b/drivers/net/can/softing/softing_main.c
index 50b1e0f21f1c..3a2b45601ec2 100644
--- a/drivers/net/can/softing/softing_main.c
+++ b/drivers/net/can/softing/softing_main.c
@@ -646,7 +646,7 @@ static const struct can_bittiming_const softing_btr_const = {
static struct net_device *softing_netdev_create(struct softing *card,
- uint16_t chip_id)
+ uint16_t chip_id)
{
struct net_device *netdev;
struct softing_priv *priv;