The first round of I/O space pointers separation.

[lincan.git] / lincan / src / ns_dev_can.c

diff --git a/lincan/src/ns_dev_can.c b/lincan/src/ns_dev_can.c
index 0fc15c07ace6711e9bada69cdb01ec1d6f928d63..4d35965c0a24a95a0ab7fa5ffe2a9ac1a5ff1240 100644 (file)
--- a/lincan/src/ns_dev_can.c
+++ b/lincan/src/ns_dev_can.c
@@ -43,7 +43,7 @@ int ns_dev_request_io(struct candevice_t *candev)
                       (unsigned long)candev->io_addr);
        }
 
-       if (!(candev->dev_base_addr = (long)ioremap(candev->io_addr, IO_RANGE))) {
+       if (!(candev->dev_base_addr = ioremap(candev->io_addr, IO_RANGE))) {
                DEBUGMSG
                    ("Failed to map IO-memory: 0x%lx - 0x%lx, mapped to 0x%lx\n",
                     (unsigned long)candev->io_addr,
@@ -76,13 +76,10 @@ int ns_dev_request_io(struct candevice_t *candev)
  */
 int ns_dev_release_io(struct candevice_t *candev)
 {
-       u16 tempReg;
-       int i;
-
        DEBUGMSG("(c%d)ns_dev_release_io (...)\n", candev->chip[0]->chip_idx);
 
        /* Release I/O memory mapping */
-       iounmap((void *)candev->dev_base_addr);
+       iounmap(candev->dev_base_addr);
 
        /* Release the memory region */
        can_release_mem_region(candev->io_addr, IO_RANGE);
@@ -148,21 +145,21 @@ int ns_dev_reset(struct candevice_t *candev)
  */
 int ns_dev_init_hw_data(struct candevice_t *candev)
 {
-       u32 sys_contVA = 0;
+       can_ioptr_t sys_contVA = NULL;
 
        /* LUCAN : Magic numbers */
-       if (!(sys_contVA = (u32) ioremap(NS9750_PERIPHERAL_BASE_ADDRESS,
+       if (!(sys_contVA = ioremap(NS9750_PERIPHERAL_BASE_ADDRESS,
                                         NS9750_PERIPHERAL_MAP_SIZE))) {
                DEBUGMSG("Failed to map FPGA memory\n");
                return -EIO;
        } else {
                DEBUGMSG("Writing to NS9750 sys cont\n");
-               writel((BUS_WIDTH_16BIT | ACTIVE_LOW_CHIP_SELECT),
+               can_writel((BUS_WIDTH_16BIT | ACTIVE_LOW_CHIP_SELECT),
                       sys_contVA + NS9750_SYSTEM_CONTROLLER_OFFSET);
        }
 
        /* We have finished with this mapping */
-       iounmap((void *)sys_contVA);
+       iounmap(sys_contVA);
 
        candev->nr_82527_chips = 0;
        candev->nr_sja1000_chips = 0;
@@ -236,12 +233,12 @@ int ns_dev_init_obj_data(struct canchip_t *chip, int objnr)
  * Return Value: The function does not return a value
  * File: src/template.c
  */
-void ns_dev_write_register(unsigned data, unsigned long address)
+void ns_dev_write_register(unsigned data, can_ioptr_t address)
 {
        int i;
        //unsigned long usecs = 1;
 
-       writew(data, address);
+       can_writew(data, address);
        //udelay( usecs );
        for (i = 0; i < 5; i++) ;
 }
@@ -256,14 +253,14 @@ void ns_dev_write_register(unsigned data, unsigned long address)
  * Return Value: The function returns the value stored in @address
  * File: src/template.c
  */
-unsigned ns_dev_read_register(unsigned long address)
+unsigned ns_dev_read_register(can_ioptr_t address)
 {
        u16 value, i;
 
-       value = readw(address);
+       value = can_readw(address);
        //udelay( usecs );
        for (i = 0; i < 5; i++) ;
-       value = readw(address);
+       value = can_readw(address);
        //udelay( usecs );
        for (i = 0; i < 5; i++) ;