diff options
author | Anton Vorontsov <avorontsov@ru.mvista.com> | 2009-08-27 03:35:56 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-08-31 00:51:43 -0400 |
commit | bf5aec2e79418adb42f1457152b427fd3d6316d9 (patch) | |
tree | 9dbb91ec11e3686085db9bf0dda428bb4e86137e /drivers/net | |
parent | 54b15983840c9eb264e41f3b14af398a72ebd426 (diff) |
ucc_geth: Remove UGETH_MAGIC_PACKET Kconfig symbol and code
This patch removes currently unused UGETH_MAGIC_PACKET Kconfig symbol
and code, i.e. magic_packet_detection_{enable,disable} functions.
The two functions each contain just two steps that we'll place into
suspend/resume code path under CONFIG_PM.
Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/Kconfig | 4 | ||||
-rw-r--r-- | drivers/net/ucc_geth.c | 32 |
2 files changed, 0 insertions, 36 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index bbe77a065845..fed9bdaecfa2 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
@@ -2373,10 +2373,6 @@ config UCC_GETH | |||
2373 | This driver supports the Gigabit Ethernet mode of the QUICC Engine, | 2373 | This driver supports the Gigabit Ethernet mode of the QUICC Engine, |
2374 | which is available on some Freescale SOCs. | 2374 | which is available on some Freescale SOCs. |
2375 | 2375 | ||
2376 | config UGETH_MAGIC_PACKET | ||
2377 | bool "Magic Packet detection support" | ||
2378 | depends on UCC_GETH | ||
2379 | |||
2380 | config UGETH_TX_ON_DEMAND | 2376 | config UGETH_TX_ON_DEMAND |
2381 | bool "Transmit on Demand support" | 2377 | bool "Transmit on Demand support" |
2382 | depends on UCC_GETH | 2378 | depends on UCC_GETH |
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c index e474e57d96fd..d2ca61d3dffc 100644 --- a/drivers/net/ucc_geth.c +++ b/drivers/net/ucc_geth.c | |||
@@ -438,38 +438,6 @@ static void hw_add_addr_in_hash(struct ucc_geth_private *ugeth, | |||
438 | QE_CR_PROTOCOL_ETHERNET, 0); | 438 | QE_CR_PROTOCOL_ETHERNET, 0); |
439 | } | 439 | } |
440 | 440 | ||
441 | #ifdef CONFIG_UGETH_MAGIC_PACKET | ||
442 | static void magic_packet_detection_enable(struct ucc_geth_private *ugeth) | ||
443 | { | ||
444 | struct ucc_fast_private *uccf; | ||
445 | struct ucc_geth __iomem *ug_regs; | ||
446 | |||
447 | uccf = ugeth->uccf; | ||
448 | ug_regs = ugeth->ug_regs; | ||
449 | |||
450 | /* Enable interrupts for magic packet detection */ | ||
451 | setbits32(uccf->p_uccm, UCC_GETH_UCCE_MPD); | ||
452 | |||
453 | /* Enable magic packet detection */ | ||
454 | setbits32(&ug_regs->maccfg2, MACCFG2_MPE); | ||
455 | } | ||
456 | |||
457 | static void magic_packet_detection_disable(struct ucc_geth_private *ugeth) | ||
458 | { | ||
459 | struct ucc_fast_private *uccf; | ||
460 | struct ucc_geth __iomem *ug_regs; | ||
461 | |||
462 | uccf = ugeth->uccf; | ||
463 | ug_regs = ugeth->ug_regs; | ||
464 | |||
465 | /* Disable interrupts for magic packet detection */ | ||
466 | clrbits32(uccf->p_uccm, UCC_GETH_UCCE_MPD); | ||
467 | |||
468 | /* Disable magic packet detection */ | ||
469 | clrbits32(&ug_regs->maccfg2, MACCFG2_MPE); | ||
470 | } | ||
471 | #endif /* MAGIC_PACKET */ | ||
472 | |||
473 | static inline int compare_addr(u8 **addr1, u8 **addr2) | 441 | static inline int compare_addr(u8 **addr1, u8 **addr2) |
474 | { | 442 | { |
475 | return memcmp(addr1, addr2, ENET_NUM_OCTETS_PER_ADDRESS); | 443 | return memcmp(addr1, addr2, ENET_NUM_OCTETS_PER_ADDRESS); |