1 files changed, 9 insertions, 168 deletions

diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.h b/drivers/scsi/aic7xxx/aic79xx_osm.h
index 853998be1474..8d6612c19922 100644
--- a/drivers/scsi/aic7xxx/aic79xx_osm.h
+++ b/drivers/scsi/aic7xxx/aic79xx_osm.h
@@ -222,22 +222,6 @@ typedef struct timer_list ahd_timer_t;
 /***************************** Timer Facilities *******************************/
 #define ahd_timer_init init_timer
 #define ahd_timer_stop del_timer_sync
-typedef void ahd_linux_callback_t (u_long);  
-static __inline void ahd_timer_reset(ahd_timer_t *timer, int usec,
-                                     ahd_callback_t *func, void *arg);
-
-static __inline void
-ahd_timer_reset(ahd_timer_t *timer, int usec, ahd_callback_t *func, void *arg)
-{
-        struct ahd_softc *ahd;
-
-        ahd = (struct ahd_softc *)arg;
-        del_timer(timer);
-        timer->data = (u_long)arg;
-        timer->expires = jiffies + (usec * HZ)/1000000;
-        timer->function = (ahd_linux_callback_t*)func;
-        add_timer(timer);
-}
 
 /***************************** SMP support ************************************/
 #include <linux/spinlock.h>
@@ -376,7 +360,7 @@ struct ahd_platform_data {
 #define AHD_LINUX_NOIRQ ((uint32_t)~0)
         uint32_t                 irq;           /* IRQ for this adapter */
         uint32_t                 bios_address;
-        uint32_t                 mem_busaddr;   /* Mem Base Addr */
+        resource_size_t          mem_busaddr;   /* Mem Base Addr */
 };
 
 /************************** OS Utility Wrappers *******************************/
@@ -386,111 +370,18 @@ struct ahd_platform_data {
 #define malloc(size, type, flags) kmalloc(size, flags)
 #define free(ptr, type) kfree(ptr)
 
-static __inline void ahd_delay(long);
-static __inline void
-ahd_delay(long usec)
-{
-        /*
-         * udelay on Linux can have problems for
-         * multi-millisecond waits.  Wait at most
-         * 1024us per call.
-         */
-        while (usec > 0) {
-                udelay(usec % 1024);
-                usec -= 1024;
-        }
-}
-
+void ahd_delay(long);
 
 /***************************** Low Level I/O **********************************/
-static __inline uint8_t ahd_inb(struct ahd_softc * ahd, long port);
-static __inline uint16_t ahd_inw_atomic(struct ahd_softc * ahd, long port);
-static __inline void ahd_outb(struct ahd_softc * ahd, long port, uint8_t val);
-static __inline void ahd_outw_atomic(struct ahd_softc * ahd,
+uint8_t ahd_inb(struct ahd_softc * ahd, long port);
+void ahd_outb(struct ahd_softc * ahd, long port, uint8_t val);
+void ahd_outw_atomic(struct ahd_softc * ahd,
                                      long port, uint16_t val);
-static __inline void ahd_outsb(struct ahd_softc * ahd, long port,
+void ahd_outsb(struct ahd_softc * ahd, long port,
                                uint8_t *, int count);
-static __inline void ahd_insb(struct ahd_softc * ahd, long port,
+void ahd_insb(struct ahd_softc * ahd, long port,
                                uint8_t *, int count);
 
-static __inline uint8_t
-ahd_inb(struct ahd_softc * ahd, long port)
-{
-        uint8_t x;
-
-        if (ahd->tags[0] == BUS_SPACE_MEMIO) {
-                x = readb(ahd->bshs[0].maddr + port);
-        } else {
-                x = inb(ahd->bshs[(port) >> 8].ioport + ((port) & 0xFF));
-        }
-        mb();
-        return (x);
-}
-
-static __inline uint16_t
-ahd_inw_atomic(struct ahd_softc * ahd, long port)
-{
-        uint8_t x;
-
-        if (ahd->tags[0] == BUS_SPACE_MEMIO) {
-                x = readw(ahd->bshs[0].maddr + port);
-        } else {
-                x = inw(ahd->bshs[(port) >> 8].ioport + ((port) & 0xFF));
-        }
-        mb();
-        return (x);
-}
-
-static __inline void
-ahd_outb(struct ahd_softc * ahd, long port, uint8_t val)
-{
-        if (ahd->tags[0] == BUS_SPACE_MEMIO) {
-                writeb(val, ahd->bshs[0].maddr + port);
-        } else {
-                outb(val, ahd->bshs[(port) >> 8].ioport + (port & 0xFF));
-        }
-        mb();
-}
-
-static __inline void
-ahd_outw_atomic(struct ahd_softc * ahd, long port, uint16_t val)
-{
-        if (ahd->tags[0] == BUS_SPACE_MEMIO) {
-                writew(val, ahd->bshs[0].maddr + port);
-        } else {
-                outw(val, ahd->bshs[(port) >> 8].ioport + (port & 0xFF));
-        }
-        mb();
-}
-
-static __inline void
-ahd_outsb(struct ahd_softc * ahd, long port, uint8_t *array, int count)
-{
-        int i;
-
-        /*
-         * There is probably a more efficient way to do this on Linux
-         * but we don't use this for anything speed critical and this
-         * should work.
-         */
-        for (i = 0; i < count; i++)
-                ahd_outb(ahd, port, *array++);
-}
-
-static __inline void
-ahd_insb(struct ahd_softc * ahd, long port, uint8_t *array, int count)
-{
-        int i;
-
-        /*
-         * There is probably a more efficient way to do this on Linux
-         * but we don't use this for anything speed critical and this
-         * should work.
-         */
-        for (i = 0; i < count; i++)
-                *array++ = ahd_inb(ahd, port);
-}
-
 /**************************** Initialization **********************************/
 int             ahd_linux_register_host(struct ahd_softc *,
                                         struct scsi_host_template *);
@@ -593,62 +484,12 @@ void			 ahd_linux_pci_exit(void);
 int                      ahd_pci_map_registers(struct ahd_softc *ahd);
 int                      ahd_pci_map_int(struct ahd_softc *ahd);
 
-static __inline uint32_t ahd_pci_read_config(ahd_dev_softc_t pci,
+uint32_t                 ahd_pci_read_config(ahd_dev_softc_t pci,
                                              int reg, int width);
-
-static __inline uint32_t
-ahd_pci_read_config(ahd_dev_softc_t pci, int reg, int width)
-{
-        switch (width) {
-        case 1:
-        {
-                uint8_t retval;
-
-                pci_read_config_byte(pci, reg, &retval);
-                return (retval);
-        }
-        case 2:
-        {
-                uint16_t retval;
-                pci_read_config_word(pci, reg, &retval);
-                return (retval);
-        }
-        case 4:
-        {
-                uint32_t retval;
-                pci_read_config_dword(pci, reg, &retval);
-                return (retval);
-        }
-        default:
-                panic("ahd_pci_read_config: Read size too big");
-                /* NOTREACHED */
-                return (0);
-        }
-}
-
-static __inline void ahd_pci_write_config(ahd_dev_softc_t pci,
+void                     ahd_pci_write_config(ahd_dev_softc_t pci,
                                           int reg, uint32_t value,
                                           int width);
 
-static __inline void
-ahd_pci_write_config(ahd_dev_softc_t pci, int reg, uint32_t value, int width)
-{
-        switch (width) {
-        case 1:
-                pci_write_config_byte(pci, reg, value);
-                break;
-        case 2:
-                pci_write_config_word(pci, reg, value);
-                break;
-        case 4:
-                pci_write_config_dword(pci, reg, value);
-                break;
-        default:
-                panic("ahd_pci_write_config: Write size too big");
-                /* NOTREACHED */
-        }
-}
-
 static __inline int ahd_get_pci_function(ahd_dev_softc_t);
 static __inline int
 ahd_get_pci_function(ahd_dev_softc_t pci)