/* initialize spare pool of rx buffers, but allocate during the open */
 static void cas_spare_init(struct cas *cp)
 {
-       spin_lock(&cp->rx_inuse_lock);
+       spin_lock(&cp->rx_inuse_lock);
        INIT_LIST_HEAD(&cp->rx_inuse_list);
        spin_unlock(&cp->rx_inuse_lock);
 
 
                        &advertising, ep->link_modes.advertising);
 
        if (gp->phy_type != phy_mii_mdio0 &&
-           gp->phy_type != phy_mii_mdio1)
-               goto non_mii;
+           gp->phy_type != phy_mii_mdio1)
+               goto non_mii;
 
        /* Setup advertise */
        if (found_mii_phy(gp))
 
        if (gp->phy_type == phy_serialink ||
            gp->phy_type == phy_serdes) {
-               u32 pcs_lpa = readl(gp->regs + PCS_MIILP);
+               u32 pcs_lpa = readl(gp->regs + PCS_MIILP);
 
                if (pcs_lpa & (PCS_MIIADV_SP | PCS_MIIADV_AP))
                        pause = 1;
 
 static void gem_init_pause_thresholds(struct gem *gp)
 {
-               u32 cfg;
+       u32 cfg;
 
        /* Calculate pause thresholds.  Setting the OFF threshold to the
         * full RX fifo size effectively disables PAUSE generation which
        /* Configure the chip "burst" DMA mode & enable some
         * HW bug fixes on Apple version
         */
-               cfg  = 0;
-               if (gp->pdev->vendor == PCI_VENDOR_ID_APPLE)
+       cfg  = 0;
+       if (gp->pdev->vendor == PCI_VENDOR_ID_APPLE)
                cfg |= GREG_CFG_RONPAULBIT | GREG_CFG_ENBUG2FIX;
 #if !defined(CONFIG_SPARC64) && !defined(CONFIG_ALPHA)
-               cfg |= GREG_CFG_IBURST;
+       cfg |= GREG_CFG_IBURST;
 #endif
-               cfg |= ((31 << 1) & GREG_CFG_TXDMALIM);
-               cfg |= ((31 << 6) & GREG_CFG_RXDMALIM);
-               writel(cfg, gp->regs + GREG_CFG);
+       cfg |= ((31 << 1) & GREG_CFG_TXDMALIM);
+       cfg |= ((31 << 6) & GREG_CFG_RXDMALIM);
+       writel(cfg, gp->regs + GREG_CFG);
 
        /* If Infinite Burst didn't stick, then use different
         * thresholds (and Apple bug fixes don't exist)
 
                                         struct net_device *dev)
 {
        struct happy_meal *hp = netdev_priv(dev);
-       int entry;
-       u32 tx_flags;
+       int entry;
+       u32 tx_flags;
 
        tx_flags = TXFLAG_OWN;
        if (skb->ip_summed == CHECKSUM_PARTIAL) {
 
        spin_lock_irq(&hp->happy_lock);
 
-       if (TX_BUFFS_AVAIL(hp) <= (skb_shinfo(skb)->nr_frags + 1)) {
+       if (TX_BUFFS_AVAIL(hp) <= (skb_shinfo(skb)->nr_frags + 1)) {
                netif_stop_queue(dev);
                spin_unlock_irq(&hp->happy_lock);
                printk(KERN_ERR "%s: BUG! Tx Ring full when queue awake!\n",