staging: gpib: use ioport_map

The tnt4882 backend has a rather elabolate way of abstracting the
PIO and MMIO based hardware variants, duplicating the functionality
of ioport_map() in a less portable way.

Change it to use ioport_map() with ioread8()/iowrite8() to do
this more easily.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20241213064959.1045243-2-arnd@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/gpib/Kconfig b/drivers/staging/gpib/Kconfig
index 275dbc32b28d4ff668429b9f67253872fd78c59f..81510db3072eb40059d209792f4aea4e078a2ea9 100644 (file)
--- a/drivers/staging/gpib/Kconfig
+++ b/drivers/staging/gpib/Kconfig
@@ -66,6 +66,7 @@ config GPIB_NI_PCI_ISA
        depends on HAS_IOPORT
        depends on !X86_PAE
        depends on PCMCIA || !PCMCIA
+       depends on HAS_IOPORT_MAP
        select GPIB_COMMON
        select GPIB_NEC7210
        help

diff --git a/drivers/staging/gpib/common/gpib_os.c b/drivers/staging/gpib/common/gpib_os.c
index f25e7c45858138d5a655449024aa319174516ccd..0fb93a9f395f437df9e8a07728812a4c278b632c 100644 (file)
--- a/drivers/staging/gpib/common/gpib_os.c
+++ b/drivers/staging/gpib/common/gpib_os.c
@@ -116,56 +116,6 @@ int io_timed_out(gpib_board_t *board)
        return 0;
 }
 
-void writeb_wrapper(unsigned int value, void *address)
-{
-       writeb(value, address);
-};
-EXPORT_SYMBOL(writeb_wrapper);
-
-void writew_wrapper(unsigned int value, void *address)
-{
-       writew(value, address);
-};
-EXPORT_SYMBOL(writew_wrapper);
-
-unsigned int readb_wrapper(void *address)
-{
-       return readb(address);
-};
-EXPORT_SYMBOL(readb_wrapper);
-
-unsigned int readw_wrapper(void *address)
-{
-       return readw(address);
-};
-EXPORT_SYMBOL(readw_wrapper);
-
-#ifdef CONFIG_HAS_IOPORT
-void outb_wrapper(unsigned int value, void *address)
-{
-       outb(value, (unsigned long)(address));
-};
-EXPORT_SYMBOL(outb_wrapper);
-
-void outw_wrapper(unsigned int value, void *address)
-{
-       outw(value, (unsigned long)(address));
-};
-EXPORT_SYMBOL(outw_wrapper);
-
-unsigned int inb_wrapper(void *address)
-{
-       return inb((unsigned long)(address));
-};
-EXPORT_SYMBOL(inb_wrapper);
-
-unsigned int inw_wrapper(void *address)
-{
-       return inw((unsigned long)(address));
-};
-EXPORT_SYMBOL(inw_wrapper);
-#endif
-
 /* this is a function instead of a constant because of Suse
  * defining HZ to be a function call to get_hz()
  */

diff --git a/drivers/staging/gpib/include/gpibP.h b/drivers/staging/gpib/include/gpibP.h
index 5fc42b645ab70c29ad0400188ed1a4b384a2b380..b97da577ba332fcfe823662690ea44f117c2aff2 100644 (file)
--- a/drivers/staging/gpib/include/gpibP.h
+++ b/drivers/staging/gpib/include/gpibP.h
@@ -16,6 +16,7 @@
 
 #include <linux/fs.h>
 #include <linux/interrupt.h>
+#include <linux/io.h>
 
 void gpib_register_driver(gpib_interface_t *interface, struct module *mod);
 void gpib_unregister_driver(gpib_interface_t *interface);
@@ -35,16 +36,5 @@ extern gpib_board_t board_array[GPIB_MAX_NUM_BOARDS];
 
 extern struct list_head registered_drivers;
 
-#include <linux/io.h>
-
-void writeb_wrapper(unsigned int value, void *address);
-unsigned int readb_wrapper(void *address);
-void outb_wrapper(unsigned int value, void *address);
-unsigned int inb_wrapper(void *address);
-void writew_wrapper(unsigned int value, void *address);
-unsigned int readw_wrapper(void *address);
-void outw_wrapper(unsigned int value, void *address);
-unsigned int inw_wrapper(void *address);
-
 #endif // _GPIB_P_H
 

diff --git a/drivers/staging/gpib/tnt4882/tnt4882_gpib.c b/drivers/staging/gpib/tnt4882/tnt4882_gpib.c
index e49a952fa0d83829bcec2e98e12f2131d7003db5..408a123e95428591de238dd13a5d7b7112c683fc 100644 (file)
--- a/drivers/staging/gpib/tnt4882/tnt4882_gpib.c
+++ b/drivers/staging/gpib/tnt4882/tnt4882_gpib.c
@@ -45,10 +45,6 @@ struct tnt4882_priv {
        unsigned short imr0_bits;
        unsigned short imr3_bits;
        unsigned short auxg_bits;       // bits written to auxiliary register G
-       void (*io_writeb)(unsigned int value, void *address);
-       void (*io_writew)(unsigned int value, void *address);
-       unsigned int (*io_readb)(void *address);
-       unsigned int (*io_readw)(void *address);
 };
 
 // interface functions
@@ -104,17 +100,17 @@ static const int atgpib_iosize = 32;
 /* paged io */
 static inline unsigned int tnt_paged_readb(struct tnt4882_priv *priv, unsigned long offset)
 {
-       priv->io_writeb(AUX_PAGEIN, priv->nec7210_priv.iobase + AUXMR * priv->nec7210_priv.offset);
+       iowrite8(AUX_PAGEIN, priv->nec7210_priv.iobase + AUXMR * priv->nec7210_priv.offset);
        udelay(1);
-       return priv->io_readb(priv->nec7210_priv.iobase + offset);
+       return ioread8(priv->nec7210_priv.iobase + offset);
 }
 
 static inline void tnt_paged_writeb(struct tnt4882_priv *priv, unsigned int value,
                                    unsigned long offset)
 {
-       priv->io_writeb(AUX_PAGEIN, priv->nec7210_priv.iobase + AUXMR * priv->nec7210_priv.offset);
+       iowrite8(AUX_PAGEIN, priv->nec7210_priv.iobase + AUXMR * priv->nec7210_priv.offset);
        udelay(1);
-       priv->io_writeb(value, priv->nec7210_priv.iobase + offset);
+       iowrite8(value, priv->nec7210_priv.iobase + offset);
 }
 
 /* readb/writeb wrappers */
@@ -134,7 +130,7 @@ static inline unsigned short tnt_readb(struct tnt4882_priv *priv, unsigned long
                switch (priv->nec7210_priv.type) {
                case TNT4882:
                case TNT5004:
-                       retval = priv->io_readb(address);
+                       retval = ioread8(address);
                        break;
                case NAT4882:
                        retval = tnt_paged_readb(priv, offset - tnt_pagein_offset);
@@ -149,7 +145,7 @@ static inline unsigned short tnt_readb(struct tnt4882_priv *priv, unsigned long
                }
                break;
        default:
-               retval = priv->io_readb(address);
+               retval = ioread8(address);
                break;
        }
        spin_unlock_irqrestore(register_lock, flags);
@@ -170,7 +166,7 @@ static inline void tnt_writeb(struct tnt4882_priv *priv, unsigned short value, u
                switch (priv->nec7210_priv.type) {
                case TNT4882:
                case TNT5004:
-                       priv->io_writeb(value, address);
+                       iowrite8(value, address);
                        break;
                case NAT4882:
                        tnt_paged_writeb(priv, value, offset - tnt_pagein_offset);
@@ -183,7 +179,7 @@ static inline void tnt_writeb(struct tnt4882_priv *priv, unsigned short value, u
                }
                break;
        default:
-               priv->io_writeb(value, address);
+               iowrite8(value, address);
                break;
        }
        spin_unlock_irqrestore(register_lock, flags);
@@ -288,7 +284,7 @@ static int drain_fifo_words(struct tnt4882_priv *tnt_priv, uint8_t *buffer, int
        while (fifo_word_available(tnt_priv) && count + 2 <= num_bytes) {
                short word;
 
-               word = tnt_priv->io_readw(nec_priv->iobase + FIFOB);
+               word = ioread16(nec_priv->iobase + FIFOB);
                buffer[count++] = word & 0xff;
                buffer[count++] = (word >> 8) & 0xff;
        }
@@ -573,7 +569,7 @@ static int generic_write(gpib_board_t *board, uint8_t *buffer, size_t length,
                        word = buffer[count++] & 0xff;
                        if (count < length)
                                word |= (buffer[count++] << 8) & 0xff00;
-                       tnt_priv->io_writew(word, nec_priv->iobase + FIFOB);
+                       iowrite16(word, nec_priv->iobase + FIFOB);
                }
 //  avoid unnecessary HR_NFF interrupts
 //             tnt_priv->imr3_bits |= HR_NFF;
@@ -1269,10 +1265,6 @@ int ni_pci_attach(gpib_board_t *board, const gpib_board_config_t *config)
        if (tnt4882_allocate_private(board))
                return -ENOMEM;
        tnt_priv = board->private_data;
-       tnt_priv->io_writeb = writeb_wrapper;
-       tnt_priv->io_readb = readb_wrapper;
-       tnt_priv->io_writew = writew_wrapper;
-       tnt_priv->io_readw = readw_wrapper;
        nec_priv = &tnt_priv->nec7210_priv;
        nec_priv->type = TNT4882;
        nec_priv->read_byte = nec7210_locking_iomem_read_byte;
@@ -1408,10 +1400,6 @@ static int ni_isa_attach_common(gpib_board_t *board, const gpib_board_config_t *
        if (tnt4882_allocate_private(board))
                return -ENOMEM;
        tnt_priv = board->private_data;
-       tnt_priv->io_writeb = outb_wrapper;
-       tnt_priv->io_readb = inb_wrapper;
-       tnt_priv->io_writew = outw_wrapper;
-       tnt_priv->io_readw = inw_wrapper;
        nec_priv = &tnt_priv->nec7210_priv;
        nec_priv->type = chipset;
        nec_priv->read_byte = nec7210_locking_ioport_read_byte;
@@ -1438,7 +1426,9 @@ static int ni_isa_attach_common(gpib_board_t *board, const gpib_board_config_t *
                pr_err("tnt4882: failed to allocate ioports\n");
                return -1;
        }
-       nec_priv->iobase = iobase;
+       nec_priv->iobase = ioport_map(iobase, atgpib_iosize);
+       if (!nec_priv->iobase)
+               return -1;
 
        // get irq
        if (request_irq(irq, tnt4882_interrupt, isr_flags, "atgpib", board)) {
@@ -1478,6 +1468,8 @@ void ni_isa_detach(gpib_board_t *board)
                        tnt4882_board_reset(tnt_priv, board);
                if (tnt_priv->irq)
                        free_irq(tnt_priv->irq, board);
+               if (nec_priv->iobase)
+                       ioport_unmap(nec_priv->iobase);
                if (nec_priv->iobase)
                        release_region((unsigned long)(nec_priv->iobase), atgpib_iosize);
                if (tnt_priv->pnp_dev)
@@ -1817,10 +1809,6 @@ int ni_pcmcia_attach(gpib_board_t *board, const gpib_board_config_t *config)
        if (tnt4882_allocate_private(board))
                return -ENOMEM;
        tnt_priv = board->private_data;
-       tnt_priv->io_writeb = outb_wrapper;
-       tnt_priv->io_readb = inb_wrapper;
-       tnt_priv->io_writew = outw_wrapper;
-       tnt_priv->io_readw = inw_wrapper;
        nec_priv = &tnt_priv->nec7210_priv;
        nec_priv->type = TNT4882;
        nec_priv->read_byte = nec7210_locking_ioport_read_byte;
@@ -1835,7 +1823,10 @@ int ni_pcmcia_attach(gpib_board_t *board, const gpib_board_config_t *config)
                return -EIO;
        }
 
-       nec_priv->iobase = (void *)(unsigned long)curr_dev->resource[0]->start;
+       nec_priv->iobase = ioport_map(curr_dev->resource[0]->start,
+                                       resource_size(curr_dev->resource[0]));
+       if (!nec_priv->iobase)
+               return -1;
 
        // get irq
        if (request_irq(curr_dev->irq, tnt4882_interrupt, isr_flags, "tnt4882", board)) {
@@ -1860,6 +1851,8 @@ void ni_pcmcia_detach(gpib_board_t *board)
                nec_priv = &tnt_priv->nec7210_priv;
                if (tnt_priv->irq)
                        free_irq(tnt_priv->irq, board);
+               if (nec_priv->iobase)
+                       ioport_unmap(nec_priv->iobase);
                if (nec_priv->iobase) {
                        tnt4882_board_reset(tnt_priv, board);
                        release_region((unsigned long)nec_priv->iobase, pcmcia_gpib_iosize);