Skip to content

Commit

Permalink
fec: remove unused #else branches
Browse files Browse the repository at this point in the history
The #else branches throughout this driver belong to a PowerPC 8xx for
which this driver is not used.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Sascha Hauer authored and David S. Miller committed Feb 1, 2009
1 parent b2f66d1 commit 51bbc3e
Showing 1 changed file with 0 additions and 92 deletions.
92 changes: 0 additions & 92 deletions drivers/net/fec.c
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,6 @@ static unsigned int fec_hw[] = {
(MCF_MBAR+0x30000),
#elif defined(CONFIG_M532x)
(MCF_MBAR+0xfc030000),
#else
&(((immap_t *)IMAP_ADDR)->im_cpm.cp_fec),
#endif
};

Expand Down Expand Up @@ -1760,96 +1758,6 @@ static void __inline__ fec_uncache(unsigned long addr)
{
}

/* ------------------------------------------------------------------------- */


#else

/*
* Code specific to the MPC860T setup.
*/
static void __inline__ fec_request_intrs(struct net_device *dev)
{
volatile immap_t *immap;

immap = (immap_t *)IMAP_ADDR; /* pointer to internal registers */

if (request_8xxirq(FEC_INTERRUPT, fec_enet_interrupt, 0, "fec", dev) != 0)
panic("Could not allocate FEC IRQ!");
}

static void __inline__ fec_get_mac(struct net_device *dev)
{
bd_t *bd;

bd = (bd_t *)__res;
memcpy(dev->dev_addr, bd->bi_enetaddr, ETH_ALEN);
}

static void __inline__ fec_set_mii(struct net_device *dev, struct fec_enet_private *fep)
{
extern uint _get_IMMR(void);
volatile immap_t *immap;
volatile fec_t *fecp;

fecp = fep->hwp;
immap = (immap_t *)IMAP_ADDR; /* pointer to internal registers */

/* Configure all of port D for MII.
*/
immap->im_ioport.iop_pdpar = 0x1fff;

/* Bits moved from Rev. D onward.
*/
if ((_get_IMMR() & 0xffff) < 0x0501)
immap->im_ioport.iop_pddir = 0x1c58; /* Pre rev. D */
else
immap->im_ioport.iop_pddir = 0x1fff; /* Rev. D and later */

/* Set MII speed to 2.5 MHz
*/
fecp->fec_mii_speed = fep->phy_speed =
((bd->bi_busfreq * 1000000) / 2500000) & 0x7e;
}

static void __inline__ fec_enable_phy_intr(void)
{
volatile fec_t *fecp;

fecp = fep->hwp;

/* Enable MII command finished interrupt
*/
fecp->fec_ivec = (FEC_INTERRUPT/2) << 29;
}

static void __inline__ fec_disable_phy_intr(void)
{
}

static void __inline__ fec_phy_ack_intr(void)
{
}

static void __inline__ fec_localhw_setup(void)
{
volatile fec_t *fecp;

fecp = fep->hwp;
fecp->fec_r_hash = PKT_MAXBUF_SIZE;
/* Enable big endian and don't care about SDMA FC.
*/
fecp->fec_fun_code = 0x78000000;
}

static void __inline__ fec_uncache(unsigned long addr)
{
pte_t *pte;
pte = va_to_pte(mem_addr);
pte_val(*pte) |= _PAGE_NO_CACHE;
flush_tlb_page(init_mm.mmap, mem_addr);
}

#endif

/* ------------------------------------------------------------------------- */
Expand Down

0 comments on commit 51bbc3e

Please sign in to comment.