Fix warnings reported by make sparse

[socketcan-devel.git] / kernel / 2.6 / drivers / net / can / sja1000 / kvaser_pci.c

diff --git a/kernel/2.6/drivers/net/can/sja1000/kvaser_pci.c b/kernel/2.6/drivers/net/can/sja1000/kvaser_pci.c
index a7e375bd0ddef3fd78f5501214168b06e2398f1c..fb10907ceaacc85b633e387f79c190b33fb305ca 100644 (file)
--- a/kernel/2.6/drivers/net/can/sja1000/kvaser_pci.c
+++ b/kernel/2.6/drivers/net/can/sja1000/kvaser_pci.c
@@ -38,11 +38,15 @@
 #include <linux/pci.h>
 #include <linux/can.h>
 #include <linux/can/dev.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
+#include <linux/io.h>
+#else
 #include <asm/io.h>
+#endif
 
 #include "sja1000.h"
 
-#define DRV_NAME  "can-kvaser-pci"
+#define DRV_NAME  "kvaser_pci"
 
 MODULE_AUTHOR("Per Dalen <per.dalen@cnw.se>");
 MODULE_DESCRIPTION("Socket-CAN driver for KVASER PCAN PCI cards");
@@ -263,7 +267,7 @@ static int kvaser_pci_add_chan(struct pci_dev *pdev, int channel,
        priv->read_reg = kvaser_pci_read_reg;
        priv->write_reg = kvaser_pci_write_reg;
 
-       priv->can.can_sys_clock = KVASER_PCI_CAN_CLOCK;
+       priv->can.bittiming.clock = KVASER_PCI_CAN_CLOCK;
 
        priv->ocr = KVASER_PCI_OCR;
        priv->cdr = KVASER_PCI_CDR;
@@ -321,20 +325,20 @@ static int __devinit kvaser_pci_init_one(struct pci_dev *pdev,
 
        /*S5920*/
        conf_addr = pci_iomap(pdev, 0, PCI_CONFIG_PORT_SIZE);
-       if (conf_addr == 0) {
+       if (conf_addr == NULL) {
                err = -ENODEV;
                goto failure_iounmap;
        }
 
        /*XILINX board wide address*/
        res_addr = pci_iomap(pdev, 2, PCI_PORT_XILINX_SIZE);
-       if (res_addr == 0) {
+       if (res_addr == NULL) {
                err = -ENOMEM;
                goto failure_iounmap;
        }
 
        base_addr = pci_iomap(pdev, 1, PCI_PORT_SIZE);
-       if (base_addr == 0) {
+       if (base_addr == NULL) {
                err = -ENOMEM;
                goto failure_iounmap;
        }
@@ -366,11 +370,11 @@ failure_cleanup:
        kvaser_pci_del_chan(master_dev);
 
 failure_iounmap:
-       if (conf_addr == 0)
+       if (conf_addr == NULL)
                pci_iounmap(pdev, conf_addr);
-       if (res_addr == 0)
+       if (res_addr == NULL)
                pci_iounmap(pdev, res_addr);
-       if (base_addr == 0)
+       if (base_addr == NULL)
                pci_iounmap(pdev, base_addr);
 
        pci_release_regions(pdev);