diff options
Diffstat (limited to 'drivers/net/fs_enet/mac-scc.c')
-rw-r--r-- | drivers/net/fs_enet/mac-scc.c | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/drivers/net/fs_enet/mac-scc.c b/drivers/net/fs_enet/mac-scc.c index 22f50dd8b277..008cdd9cc536 100644 --- a/drivers/net/fs_enet/mac-scc.c +++ b/drivers/net/fs_enet/mac-scc.c | |||
@@ -377,30 +377,6 @@ static void stop(struct net_device *dev) | |||
377 | fs_cleanup_bds(dev); | 377 | fs_cleanup_bds(dev); |
378 | } | 378 | } |
379 | 379 | ||
380 | static void pre_request_irq(struct net_device *dev, int irq) | ||
381 | { | ||
382 | #ifndef CONFIG_PPC_MERGE | ||
383 | immap_t *immap = fs_enet_immap; | ||
384 | u32 siel; | ||
385 | |||
386 | /* SIU interrupt */ | ||
387 | if (irq >= SIU_IRQ0 && irq < SIU_LEVEL7) { | ||
388 | |||
389 | siel = in_be32(&immap->im_siu_conf.sc_siel); | ||
390 | if ((irq & 1) == 0) | ||
391 | siel |= (0x80000000 >> irq); | ||
392 | else | ||
393 | siel &= ~(0x80000000 >> (irq & ~1)); | ||
394 | out_be32(&immap->im_siu_conf.sc_siel, siel); | ||
395 | } | ||
396 | #endif | ||
397 | } | ||
398 | |||
399 | static void post_free_irq(struct net_device *dev, int irq) | ||
400 | { | ||
401 | /* nothing */ | ||
402 | } | ||
403 | |||
404 | static void napi_clear_rx_event(struct net_device *dev) | 380 | static void napi_clear_rx_event(struct net_device *dev) |
405 | { | 381 | { |
406 | struct fs_enet_private *fep = netdev_priv(dev); | 382 | struct fs_enet_private *fep = netdev_priv(dev); |
@@ -494,8 +470,6 @@ const struct fs_ops fs_scc_ops = { | |||
494 | .set_multicast_list = set_multicast_list, | 470 | .set_multicast_list = set_multicast_list, |
495 | .restart = restart, | 471 | .restart = restart, |
496 | .stop = stop, | 472 | .stop = stop, |
497 | .pre_request_irq = pre_request_irq, | ||
498 | .post_free_irq = post_free_irq, | ||
499 | .napi_clear_rx_event = napi_clear_rx_event, | 473 | .napi_clear_rx_event = napi_clear_rx_event, |
500 | .napi_enable_rx = napi_enable_rx, | 474 | .napi_enable_rx = napi_enable_rx, |
501 | .napi_disable_rx = napi_disable_rx, | 475 | .napi_disable_rx = napi_disable_rx, |