diff options
author | Kumar Gala <galak@kernel.crashing.org> | 2009-04-28 05:05:21 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-04-28 05:05:21 -0400 |
commit | 1d58ea30b141c95bd21fb39021d4b602f48b30be (patch) | |
tree | 5140b56b65c640f1f6dfe317c8b2ec6e81aa31ce /drivers/net/fs_enet/mac-fec.c | |
parent | bc59fcda671ee15362986a902bbd90e218fe84c4 (diff) |
fs_enet: Remove dead code
CONFIG_DUET doesn't exist anymore, remove all the code that exists to
support it.
[ Simplify fs_init() even further -DaveM ]
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/fs_enet/mac-fec.c')
-rw-r--r-- | drivers/net/fs_enet/mac-fec.c | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/drivers/net/fs_enet/mac-fec.c b/drivers/net/fs_enet/mac-fec.c index 14e575313c89..ca7bcb8ab3a1 100644 --- a/drivers/net/fs_enet/mac-fec.c +++ b/drivers/net/fs_enet/mac-fec.c | |||
@@ -245,10 +245,6 @@ static void set_multicast_list(struct net_device *dev) | |||
245 | 245 | ||
246 | static void restart(struct net_device *dev) | 246 | static void restart(struct net_device *dev) |
247 | { | 247 | { |
248 | #ifdef CONFIG_DUET | ||
249 | immap_t *immap = fs_enet_immap; | ||
250 | u32 cptr; | ||
251 | #endif | ||
252 | struct fs_enet_private *fep = netdev_priv(dev); | 248 | struct fs_enet_private *fep = netdev_priv(dev); |
253 | fec_t __iomem *fecp = fep->fec.fecp; | 249 | fec_t __iomem *fecp = fep->fec.fecp; |
254 | const struct fs_platform_info *fpi = fep->fpi; | 250 | const struct fs_platform_info *fpi = fep->fpi; |
@@ -315,36 +311,6 @@ static void restart(struct net_device *dev) | |||
315 | FW(fecp, ievent, 0xffc0); | 311 | FW(fecp, ievent, 0xffc0); |
316 | FW(fecp, ivec, (virq_to_hw(fep->interrupt) / 2) << 29); | 312 | FW(fecp, ivec, (virq_to_hw(fep->interrupt) / 2) << 29); |
317 | 313 | ||
318 | /* | ||
319 | * adjust to speed (only for DUET & RMII) | ||
320 | */ | ||
321 | #ifdef CONFIG_DUET | ||
322 | if (fpi->use_rmii) { | ||
323 | cptr = in_be32(&immap->im_cpm.cp_cptr); | ||
324 | switch (fs_get_fec_index(fpi->fs_no)) { | ||
325 | case 0: | ||
326 | cptr |= 0x100; | ||
327 | if (fep->speed == 10) | ||
328 | cptr |= 0x0000010; | ||
329 | else if (fep->speed == 100) | ||
330 | cptr &= ~0x0000010; | ||
331 | break; | ||
332 | case 1: | ||
333 | cptr |= 0x80; | ||
334 | if (fep->speed == 10) | ||
335 | cptr |= 0x0000008; | ||
336 | else if (fep->speed == 100) | ||
337 | cptr &= ~0x0000008; | ||
338 | break; | ||
339 | default: | ||
340 | BUG(); /* should never happen */ | ||
341 | break; | ||
342 | } | ||
343 | out_be32(&immap->im_cpm.cp_cptr, cptr); | ||
344 | } | ||
345 | #endif | ||
346 | |||
347 | |||
348 | FW(fecp, r_cntrl, FEC_RCNTRL_MII_MODE); /* MII enable */ | 314 | FW(fecp, r_cntrl, FEC_RCNTRL_MII_MODE); /* MII enable */ |
349 | /* | 315 | /* |
350 | * adjust to duplex mode | 316 | * adjust to duplex mode |