aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/can/mscan
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-12-06 09:30:56 -0500
committerDavid S. Miller <davem@davemloft.net>2012-12-07 14:22:22 -0500
commit1dd06ae8db716e17ec7e06244b858606edf378c0 (patch)
treeae4116a9b029ab570a58fae5275cfbb3af6a1d64 /drivers/net/can/mscan
parent45122ca26ced7fae41049326a3797a73f961db2e (diff)
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/mscan')
-rw-r--r--drivers/net/can/mscan/mpc5xxx_can.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/net/can/mscan/mpc5xxx_can.c b/drivers/net/can/mscan/mpc5xxx_can.c
index 06a4561955ca..668850e441dc 100644
--- a/drivers/net/can/mscan/mpc5xxx_can.c
+++ b/drivers/net/can/mscan/mpc5xxx_can.c
@@ -49,8 +49,7 @@ static struct of_device_id mpc52xx_cdm_ids[] = {
49}; 49};
50 50
51static u32 mpc52xx_can_get_clock(struct platform_device *ofdev, 51static u32 mpc52xx_can_get_clock(struct platform_device *ofdev,
52 const char *clock_name, 52 const char *clock_name, int *mscan_clksrc)
53 int *mscan_clksrc)
54{ 53{
55 unsigned int pvr; 54 unsigned int pvr;
56 struct mpc52xx_cdm __iomem *cdm; 55 struct mpc52xx_cdm __iomem *cdm;
@@ -102,8 +101,7 @@ static u32 mpc52xx_can_get_clock(struct platform_device *ofdev,
102} 101}
103#else /* !CONFIG_PPC_MPC52xx */ 102#else /* !CONFIG_PPC_MPC52xx */
104static u32 mpc52xx_can_get_clock(struct platform_device *ofdev, 103static u32 mpc52xx_can_get_clock(struct platform_device *ofdev,
105 const char *clock_name, 104 const char *clock_name, int *mscan_clksrc)
106 int *mscan_clksrc)
107{ 105{
108 return 0; 106 return 0;
109} 107}
@@ -130,8 +128,7 @@ static struct of_device_id mpc512x_clock_ids[] = {
130}; 128};
131 129
132static u32 mpc512x_can_get_clock(struct platform_device *ofdev, 130static u32 mpc512x_can_get_clock(struct platform_device *ofdev,
133 const char *clock_name, 131 const char *clock_name, int *mscan_clksrc)
134 int *mscan_clksrc)
135{ 132{
136 struct mpc512x_clockctl __iomem *clockctl; 133 struct mpc512x_clockctl __iomem *clockctl;
137 struct device_node *np_clock; 134 struct device_node *np_clock;
@@ -240,8 +237,7 @@ exit_put:
240} 237}
241#else /* !CONFIG_PPC_MPC512x */ 238#else /* !CONFIG_PPC_MPC512x */
242static u32 mpc512x_can_get_clock(struct platform_device *ofdev, 239static u32 mpc512x_can_get_clock(struct platform_device *ofdev,
243 const char *clock_name, 240 const char *clock_name, int *mscan_clksrc)
244 int *mscan_clksrc)
245{ 241{
246 return 0; 242 return 0;
247} 243}