fsl_pq_mdio: Fix iomem unmapping for non-eTSEC2.0 controllers

[safe/jmp/linux-2.6] / drivers / net / s6gmac.c

diff --git a/drivers/net/s6gmac.c b/drivers/net/s6gmac.c
index 5345e47..45f2634 100644 (file)
--- a/drivers/net/s6gmac.c
+++ b/drivers/net/s6gmac.c
@@ -373,9 +373,9 @@ struct s6gmac {
 static void s6gmac_rx_fillfifo(struct s6gmac *pd)
 {
        struct sk_buff *skb;
-       while ((((u8)(pd->rx_skb_i - pd->rx_skb_o)) < S6_NUM_RX_SKB)
-                       && (!s6dmac_fifo_full(pd->rx_dma, pd->rx_chan))
-                       && (skb = dev_alloc_skb(S6_MAX_FRLEN + 2))) {
+       while ((((u8)(pd->rx_skb_i - pd->rx_skb_o)) < S6_NUM_RX_SKB) &&
+              (!s6dmac_fifo_full(pd->rx_dma, pd->rx_chan)) &&
+              (skb = dev_alloc_skb(S6_MAX_FRLEN + 2))) {
                pd->rx_skb[(pd->rx_skb_i++) % S6_NUM_RX_SKB] = skb;
                s6dmac_put_fifo_cache(pd->rx_dma, pd->rx_chan,
                        pd->io, (u32)skb->data, S6_MAX_FRLEN);
@@ -793,7 +793,7 @@ static inline int s6gmac_phy_start(struct net_device *dev)
        struct s6gmac *pd = netdev_priv(dev);
        int i = 0;
        struct phy_device *p = NULL;
-       while ((!(p = pd->mii.bus->phy_map[i])) && (i < PHY_MAX_ADDR))
+       while ((i < PHY_MAX_ADDR) && (!(p = pd->mii.bus->phy_map[i])))
                i++;
        p = phy_connect(dev, dev_name(&p->dev), &s6gmac_adjust_link, 0,
                        PHY_INTERFACE_MODE_RGMII);
@@ -984,7 +984,7 @@ static int __devinit s6gmac_probe(struct platform_device *pdev)
        pd->rx_dma = DMA_MASK_DMAC(i);
        pd->rx_chan = DMA_INDEX_CHNL(i);
        pd->io = platform_get_resource(pdev, IORESOURCE_IO, 0)->start;
-       res = request_irq(dev->irq, &s6gmac_interrupt, 0, dev->name, dev);
+       res = request_irq(dev->irq, s6gmac_interrupt, 0, dev->name, dev);
        if (res) {
                printk(KERN_ERR DRV_PRMT "irq request failed: %d\n", dev->irq);
                goto errirq;