Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 27 insertions, 48 deletions

diff --git a/drivers/net/tulip/uli526x.c b/drivers/net/tulip/uli526x.c
index 96de5829b940..9e63f406f72d 100644
--- a/drivers/net/tulip/uli526x.c
+++ b/drivers/net/tulip/uli526x.c
@@ -209,8 +209,7 @@ enum uli526x_CR6_bits {
 /* Global variable declaration ----------------------------- */
 static int __devinitdata printed_version;
 static const char version[] __devinitconst =
-        KERN_INFO DRV_NAME ": ULi M5261/M5263 net driver, version "
-        DRV_VERSION " (" DRV_RELDATE ")\n";
+        "ULi M5261/M5263 net driver, version " DRV_VERSION " (" DRV_RELDATE ")";
 
 static int uli526x_debug;
 static unsigned char uli526x_media_mode = ULI526X_AUTO;
@@ -283,7 +282,7 @@ static int __devinit uli526x_init_one (struct pci_dev *pdev,
         ULI526X_DBUG(0, "uli526x_init_one()", 0);
 
         if (!printed_version++)
-                printk(version);
+                pr_info("%s\n", version);
 
         /* Init network device */
         dev = alloc_etherdev(sizeof(*db));
@@ -292,7 +291,7 @@ static int __devinit uli526x_init_one (struct pci_dev *pdev,
         SET_NETDEV_DEV(dev, &pdev->dev);
 
         if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) {
-                pr_warning("32-bit PCI DMA not available\n");
+                pr_warn("32-bit PCI DMA not available\n");
                 err = -ENODEV;
                 goto err_out_free;
         }
@@ -390,9 +389,9 @@ static int __devinit uli526x_init_one (struct pci_dev *pdev,
         if (err)
                 goto err_out_res;
 
-        dev_info(&dev->dev, "ULi M%04lx at pci%s, %pM, irq %d\n",
-                 ent->driver_data >> 16, pci_name(pdev),
-                 dev->dev_addr, dev->irq);
+        netdev_info(dev, "ULi M%04lx at pci%s, %pM, irq %d\n",
+                    ent->driver_data >> 16, pci_name(pdev),
+                    dev->dev_addr, dev->irq);
 
         pci_set_master(pdev);
 
@@ -480,7 +479,7 @@ static int uli526x_open(struct net_device *dev)
         init_timer(&db->timer);
         db->timer.expires = ULI526X_TIMER_WUT + HZ * 2;
         db->timer.data = (unsigned long)dev;
-        db->timer.function = &uli526x_timer;
+        db->timer.function = uli526x_timer;
         add_timer(&db->timer);
 
         return 0;
@@ -524,7 +523,7 @@ static void uli526x_init(struct net_device *dev)
                 }
         }
         if(phy_tmp == 32)
-                pr_warning("Can not find the phy address!!!");
+                pr_warn("Can not find the phy address!!!\n");
         /* Parser SROM and media mode */
         db->media_mode = uli526x_media_mode;
 
@@ -590,7 +589,7 @@ static netdev_tx_t uli526x_start_xmit(struct sk_buff *skb,
 
         /* Too large packet check */
         if (skb->len > MAX_PACKET_SIZE) {
-                pr_err("big packet = %d\n", (u16)skb->len);
+                netdev_err(dev, "big packet = %d\n", (u16)skb->len);
                 dev_kfree_skb(skb);
                 return NETDEV_TX_OK;
         }
@@ -600,7 +599,7 @@ static netdev_tx_t uli526x_start_xmit(struct sk_buff *skb,
         /* No Tx resource check, it never happen nromally */
         if (db->tx_packet_cnt >= TX_FREE_DESC_CNT) {
                 spin_unlock_irqrestore(&db->lock, flags);
-                pr_err("No Tx resource %ld\n", db->tx_packet_cnt);
+                netdev_err(dev, "No Tx resource %ld\n", db->tx_packet_cnt);
                 return NETDEV_TX_BUSY;
         }
 
@@ -667,15 +666,6 @@ static int uli526x_stop(struct net_device *dev)
         /* free allocated rx buffer */
         uli526x_free_rxbuffer(db);
 
-#if 0
-        /* show statistic counter */
-        printk(DRV_NAME ": FU:%lx EC:%lx LC:%lx NC:%lx LOC:%lx TXJT:%lx RESET:%lx RCR8:%lx FAL:%lx TT:%lx\n",
-                db->tx_fifo_underrun, db->tx_excessive_collision,
-                db->tx_late_collision, db->tx_no_carrier, db->tx_loss_carrier,
-                db->tx_jabber_timeout, db->reset_count, db->reset_cr8,
-                db->reset_fatal, db->reset_TXtimeout);
-#endif
-
         return 0;
 }
 
@@ -755,7 +745,6 @@ static void uli526x_free_tx_pkt(struct net_device *dev,
         txptr = db->tx_remove_ptr;
         while(db->tx_packet_cnt) {
                 tdes0 = le32_to_cpu(txptr->tdes0);
-                /* printk(DRV_NAME ": tdes0=%x\n", tdes0); */
                 if (tdes0 & 0x80000000)
                         break;
 
@@ -765,7 +754,6 @@ static void uli526x_free_tx_pkt(struct net_device *dev,
 
                 /* Transmit statistic counter */
                 if ( tdes0 != 0x7fffffff ) {
-                        /* printk(DRV_NAME ": tdes0=%x\n", tdes0); */
                         dev->stats.collisions += (tdes0 >> 3) & 0xf;
                         dev->stats.tx_bytes += le32_to_cpu(txptr->tdes1) & 0x7ff;
                         if (tdes0 & TDES0_ERR_MASK) {
@@ -838,7 +826,6 @@ static void uli526x_rx_packet(struct net_device *dev, struct uli526x_board_info
                         /* error summary bit check */
                         if (rdes0 & 0x8000) {
                                 /* This is a error packet */
-                                //printk(DRV_NAME ": rdes0: %lx\n", rdes0);
                                 dev->stats.rx_errors++;
                                 if (rdes0 & 1)
                                         dev->stats.rx_fifo_errors++;
@@ -945,12 +932,12 @@ ULi_ethtool_gset(struct uli526x_board_info *db, struct ethtool_cmd *ecmd)
 
         ecmd->transceiver = XCVR_EXTERNAL;
 
-        ecmd->speed = 10;
+        ethtool_cmd_speed_set(ecmd, SPEED_10);
         ecmd->duplex = DUPLEX_HALF;
 
         if(db->op_mode==ULI526X_100MHF || db->op_mode==ULI526X_100MFD)
         {
-                ecmd->speed = 100;
+                ethtool_cmd_speed_set(ecmd, SPEED_100);
         }
         if(db->op_mode==ULI526X_10MFD || db->op_mode==ULI526X_100MFD)
         {
@@ -958,7 +945,7 @@ ULi_ethtool_gset(struct uli526x_board_info *db, struct ethtool_cmd *ecmd)
         }
         if(db->link_failed)
         {
-                ecmd->speed = -1;
+                ethtool_cmd_speed_set(ecmd, -1);
                 ecmd->duplex = -1;
         }
 
@@ -1024,7 +1011,6 @@ static void uli526x_timer(unsigned long data)
         struct net_device *dev = (struct net_device *) data;
         struct uli526x_board_info *db = netdev_priv(dev);
         unsigned long flags;
-        u8 TmpSpeed=10;
 
         //ULI526X_DBUG(0, "uli526x_timer()", 0);
         spin_lock_irqsave(&db->lock, flags);
@@ -1047,8 +1033,7 @@ static void uli526x_timer(unsigned long data)
                 if ( time_after(jiffies, dev_trans_start(dev) + ULI526X_TX_TIMEOUT) ) {
                         db->reset_TXtimeout++;
                         db->wait_reset = 1;
-                        printk( "%s: Tx timeout - resetting\n",
-                               dev->name);
+                        netdev_err(dev, " Tx timeout - resetting\n");
                 }
         }
 
@@ -1070,7 +1055,7 @@ static void uli526x_timer(unsigned long data)
                 /* Link Failed */
                 ULI526X_DBUG(0, "Link Failed", tmp_cr12);
                 netif_carrier_off(dev);
-                pr_info("%s NIC Link is Down\n",dev->name);
+                netdev_info(dev, "NIC Link is Down\n");
                 db->link_failed = 1;
 
                 /* For Force 10/100M Half/Full mode: Enable Auto-Nego mode */
@@ -1096,18 +1081,13 @@ static void uli526x_timer(unsigned long data)
 
                         if(db->link_failed==0)
                         {
-                                if(db->op_mode==ULI526X_100MHF || db->op_mode==ULI526X_100MFD)
-                                {
-                                        TmpSpeed = 100;
-                                }
-                                if(db->op_mode==ULI526X_10MFD || db->op_mode==ULI526X_100MFD)
-                                {
-                                        pr_info("%s NIC Link is Up %d Mbps Full duplex\n",dev->name,TmpSpeed);
-                                }
-                                else
-                                {
-                                        pr_info("%s NIC Link is Up %d Mbps Half duplex\n",dev->name,TmpSpeed);
-                                }
+                                netdev_info(dev, "NIC Link is Up %d Mbps %s duplex\n",
+                                            (db->op_mode == ULI526X_100MHF ||
+                                             db->op_mode == ULI526X_100MFD)
+                                            ? 100 : 10,
+                                            (db->op_mode == ULI526X_10MFD ||
+                                             db->op_mode == ULI526X_100MFD)
+                                            ? "Full" : "Half");
                                 netif_carrier_on(dev);
                         }
                         /* SHOW_MEDIA_TYPE(db->op_mode); */
@@ -1116,7 +1096,7 @@ static void uli526x_timer(unsigned long data)
                 {
                         if(db->init==1)
                         {
-                                pr_info("%s NIC Link is Down\n",dev->name);
+                                netdev_info(dev, "NIC Link is Down\n");
                                 netif_carrier_off(dev);
                         }
                 }
@@ -1242,7 +1222,7 @@ static int uli526x_resume(struct pci_dev *pdev)
 
         err = pci_set_power_state(pdev, PCI_D0);
         if (err) {
-                dev_warn(&dev->dev, "Could not put device into D0\n");
+                netdev_warn(dev, "Could not put device into D0\n");
                 return err;
         }
 
@@ -1443,7 +1423,7 @@ static void send_filter_frame(struct net_device *dev, int mc_cnt)
                 update_cr6(db->cr6_data, dev->base_addr);
                 dev->trans_start = jiffies;
         } else
-                pr_err("No Tx resource - Send_filter_frame!\n");
+                netdev_err(dev, "No Tx resource - Send_filter_frame!\n");
 }
 
 
@@ -1540,7 +1520,6 @@ static u8 uli526x_sense_speed(struct uli526x_board_info * db)
                 else
                         phy_mode = 0x1000;
 
-                /* printk(DRV_NAME ": Phy_mode %x ",phy_mode); */
                 switch (phy_mode) {
                 case 0x1000: db->op_mode = ULI526X_10MHF; break;
                 case 0x2000: db->op_mode = ULI526X_10MFD; break;
@@ -1747,7 +1726,7 @@ static u16 phy_readby_cr10(unsigned long iobase, u8 phy_addr, u8 offset)
                 if(cr10_value&0x10000000)
                         break;
         }
-        return (cr10_value&0x0ffff);
+        return cr10_value & 0x0ffff;
 }
 
 static void phy_writeby_cr10(unsigned long iobase, u8 phy_addr, u8 offset, u16 phy_data)
@@ -1829,7 +1808,7 @@ MODULE_PARM_DESC(mode, "ULi M5261/M5263: Bit 0: 10/100Mbps, bit 2: duplex, bit 8
 static int __init uli526x_init_module(void)
 {
 
-        printk(version);
+        pr_info("%s\n", version);
         printed_version = 1;
 
         ULI526X_DBUG(0, "init_module() ", debug);