EMAC driver: define MDC_CLK=2.5MHz and caculate mdc_div according to SCLK.

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

diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c
index 5da8e67..ec95e49 100644 (file)
--- a/drivers/net/sis900.c
+++ b/drivers/net/sis900.c
@@ -404,6 +404,7 @@ static int __devinit sis900_probe(struct pci_dev *pci_dev,
        int i, ret;
        const char *card_name = card_names[pci_id->driver_data];
        const char *dev_name = pci_name(pci_dev);
+       DECLARE_MAC_BUF(mac);
 
 /* when built into the kernel, we only print version if device is found */
 #ifndef MODULE
@@ -418,7 +419,7 @@ static int __devinit sis900_probe(struct pci_dev *pci_dev,
 
        i = pci_set_dma_mask(pci_dev, DMA_32BIT_MASK);
        if(i){
-               printk(KERN_ERR "sis900.c: architecture does not support"
+               printk(KERN_ERR "sis900.c: architecture does not support "
                        "32bit PCI busmaster DMA\n");
                return i;
        }
@@ -533,11 +534,9 @@ static int __devinit sis900_probe(struct pci_dev *pci_dev,
                goto err_unmap_rx;
 
        /* print some information about our NIC */
-       printk(KERN_INFO "%s: %s at %#lx, IRQ %d, ", net_dev->name,
-              card_name, ioaddr, net_dev->irq);
-       for (i = 0; i < 5; i++)
-               printk("%2.2x:", (u8)net_dev->dev_addr[i]);
-       printk("%2.2x.\n", net_dev->dev_addr[i]);
+       printk(KERN_INFO "%s: %s at %#lx, IRQ %d, %s\n",
+              net_dev->name, card_name, ioaddr, net_dev->irq,
+              print_mac(mac, net_dev->dev_addr));
 
        /* Detect Wake on Lan support */
        ret = (inl(net_dev->base_addr + CFGPMC) & PMESP) >> 27;
@@ -1668,7 +1667,7 @@ static irqreturn_t sis900_interrupt(int irq, void *dev_instance)
                /* something strange happened !!! */
                if (status & HIBERR) {
                        if(netif_msg_intr(sis_priv))
-                               printk(KERN_INFO "%s: Abnormal interrupt,"
+                               printk(KERN_INFO "%s: Abnormal interrupt, "
                                        "status %#8.8x.\n", net_dev->name, status);
                        break;
                }
@@ -1821,7 +1820,7 @@ refill_rx_ring:
                                 * how the hardware will react to this kind
                                 * of degenerated buffer */
                                if (netif_msg_rx_err(sis_priv))
-                                       printk(KERN_INFO "%s: Memory squeeze,"
+                                       printk(KERN_INFO "%s: Memory squeeze, "
                                                "deferring packet.\n",
                                                net_dev->name);
                                net_dev->stats.rx_dropped++;