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>

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index bbe77a0658450a3f6da56ef25346288c8a671343..fed9bdaecfa229f2980df54ca3136423bae44bfe 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2373,10 +2373,6 @@ config UCC_GETH
          This driver supports the Gigabit Ethernet mode of the QUICC Engine,
          which is available on some Freescale SOCs.
 
-config UGETH_MAGIC_PACKET
-       bool "Magic Packet detection support"
-       depends on UCC_GETH
-
 config UGETH_TX_ON_DEMAND
        bool "Transmit on Demand support"
        depends on UCC_GETH

diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c
index e474e57d96fd058e37ab1c07a1aa9992b87ae532..d2ca61d3dffce4e50f52dcbaaf4a78570e1a8a2e 100644 (file)
--- 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,
                     QE_CR_PROTOCOL_ETHERNET, 0);
 }
 
-#ifdef CONFIG_UGETH_MAGIC_PACKET
-static void magic_packet_detection_enable(struct ucc_geth_private *ugeth)
-{
-       struct ucc_fast_private *uccf;
-       struct ucc_geth __iomem *ug_regs;
-
-       uccf = ugeth->uccf;
-       ug_regs = ugeth->ug_regs;
-
-       /* Enable interrupts for magic packet detection */
-       setbits32(uccf->p_uccm, UCC_GETH_UCCE_MPD);
-
-       /* Enable magic packet detection */
-       setbits32(&ug_regs->maccfg2, MACCFG2_MPE);
-}
-
-static void magic_packet_detection_disable(struct ucc_geth_private *ugeth)
-{
-       struct ucc_fast_private *uccf;
-       struct ucc_geth __iomem *ug_regs;
-
-       uccf = ugeth->uccf;
-       ug_regs = ugeth->ug_regs;
-
-       /* Disable interrupts for magic packet detection */
-       clrbits32(uccf->p_uccm, UCC_GETH_UCCE_MPD);
-
-       /* Disable magic packet detection */
-       clrbits32(&ug_regs->maccfg2, MACCFG2_MPE);
-}
-#endif /* MAGIC_PACKET */
-
 static inline int compare_addr(u8 **addr1, u8 **addr2)
 {
        return memcmp(addr1, addr2, ENET_NUM_OCTETS_PER_ADDRESS);