Skip to content

Commit

Permalink
ucc_geth: Remove UGETH_MAGIC_PACKET Kconfig symbol and code
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Anton Vorontsov authored and David S. Miller committed Aug 31, 2009
1 parent 54b1598 commit bf5aec2
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 36 deletions.
4 changes: 0 additions & 4 deletions drivers/net/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
32 changes: 0 additions & 32 deletions drivers/net/ucc_geth.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit bf5aec2

Please sign in to comment.