aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/ibm
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/ethernet/ibm')
-rw-r--r--drivers/net/ethernet/ibm/ehea/ehea_main.c4
-rw-r--r--drivers/net/ethernet/ibm/emac/core.c8
-rw-r--r--drivers/net/ethernet/ibm/emac/mal.c3
-rw-r--r--drivers/net/ethernet/ibm/ibmveth.c3
4 files changed, 8 insertions, 10 deletions
diff --git a/drivers/net/ethernet/ibm/ehea/ehea_main.c b/drivers/net/ethernet/ibm/ehea/ehea_main.c
index e238130574c..19b64de7124 100644
--- a/drivers/net/ethernet/ibm/ehea/ehea_main.c
+++ b/drivers/net/ethernet/ibm/ehea/ehea_main.c
@@ -99,7 +99,7 @@ static struct ehea_bcmc_reg_array ehea_bcmc_regs;
99 99
100 100
101static int ehea_probe_adapter(struct platform_device *dev, 101static int ehea_probe_adapter(struct platform_device *dev,
102 const struct of_device_id *id); 102 const struct of_device_id *id);
103 103
104static int ehea_remove(struct platform_device *dev); 104static int ehea_remove(struct platform_device *dev);
105 105
@@ -3258,7 +3258,7 @@ static void ehea_remove_device_sysfs(struct platform_device *dev)
3258} 3258}
3259 3259
3260static int ehea_probe_adapter(struct platform_device *dev, 3260static int ehea_probe_adapter(struct platform_device *dev,
3261 const struct of_device_id *id) 3261 const struct of_device_id *id)
3262{ 3262{
3263 struct ehea_adapter *adapter; 3263 struct ehea_adapter *adapter;
3264 const u64 *adapter_handle; 3264 const u64 *adapter_handle;
diff --git a/drivers/net/ethernet/ibm/emac/core.c b/drivers/net/ethernet/ibm/emac/core.c
index c791ad3907b..256bdb8e199 100644
--- a/drivers/net/ethernet/ibm/emac/core.c
+++ b/drivers/net/ethernet/ibm/emac/core.c
@@ -2262,7 +2262,7 @@ struct emac_depentry {
2262#define EMAC_DEP_COUNT 6 2262#define EMAC_DEP_COUNT 6
2263 2263
2264static int emac_check_deps(struct emac_instance *dev, 2264static int emac_check_deps(struct emac_instance *dev,
2265 struct emac_depentry *deps) 2265 struct emac_depentry *deps)
2266{ 2266{
2267 int i, there = 0; 2267 int i, there = 0;
2268 struct device_node *np; 2268 struct device_node *np;
@@ -2314,8 +2314,8 @@ static void emac_put_deps(struct emac_instance *dev)
2314 of_dev_put(dev->tah_dev); 2314 of_dev_put(dev->tah_dev);
2315} 2315}
2316 2316
2317static int emac_of_bus_notify(struct notifier_block *nb, 2317static int emac_of_bus_notify(struct notifier_block *nb, unsigned long action,
2318 unsigned long action, void *data) 2318 void *data)
2319{ 2319{
2320 /* We are only intereted in device addition */ 2320 /* We are only intereted in device addition */
2321 if (action == BUS_NOTIFY_BOUND_DRIVER) 2321 if (action == BUS_NOTIFY_BOUND_DRIVER)
@@ -2368,7 +2368,7 @@ static int emac_wait_deps(struct emac_instance *dev)
2368} 2368}
2369 2369
2370static int emac_read_uint_prop(struct device_node *np, const char *name, 2370static int emac_read_uint_prop(struct device_node *np, const char *name,
2371 u32 *val, int fatal) 2371 u32 *val, int fatal)
2372{ 2372{
2373 int len; 2373 int len;
2374 const u32 *prop = of_get_property(np, name, &len); 2374 const u32 *prop = of_get_property(np, name, &len);
diff --git a/drivers/net/ethernet/ibm/emac/mal.c b/drivers/net/ethernet/ibm/emac/mal.c
index 8becaaf6eb5..50ea12bfb57 100644
--- a/drivers/net/ethernet/ibm/emac/mal.c
+++ b/drivers/net/ethernet/ibm/emac/mal.c
@@ -33,8 +33,7 @@
33 33
34static int mal_count; 34static int mal_count;
35 35
36int mal_register_commac(struct mal_instance *mal, 36int mal_register_commac(struct mal_instance *mal, struct mal_commac *commac)
37 struct mal_commac *commac)
38{ 37{
39 unsigned long flags; 38 unsigned long flags;
40 39
diff --git a/drivers/net/ethernet/ibm/ibmveth.c b/drivers/net/ethernet/ibm/ibmveth.c
index 35485f2c144..f2fdbb79837 100644
--- a/drivers/net/ethernet/ibm/ibmveth.c
+++ b/drivers/net/ethernet/ibm/ibmveth.c
@@ -1324,8 +1324,7 @@ static const struct net_device_ops ibmveth_netdev_ops = {
1324#endif 1324#endif
1325}; 1325};
1326 1326
1327static int ibmveth_probe(struct vio_dev *dev, 1327static int ibmveth_probe(struct vio_dev *dev, const struct vio_device_id *id)
1328 const struct vio_device_id *id)
1329{ 1328{
1330 int rc, i; 1329 int rc, i;
1331 struct net_device *netdev; 1330 struct net_device *netdev;