16 files changed, 111 insertions, 126 deletions

diff --git a/arch/sh/Makefile b/arch/sh/Makefile
index b5635635b5ee..19f00d57acf0 100644
--- a/arch/sh/Makefile
+++ b/arch/sh/Makefile
@@ -155,7 +155,7 @@ endif
 prepare: maketools include/asm-sh/.cpu include/asm-sh/.mach
 
 .PHONY: maketools FORCE
-maketools: include/asm-sh/asm-offsets.h include/linux/version.h FORCE
+maketools:  include/linux/version.h FORCE
         $(Q)$(MAKE) $(build)=arch/sh/tools include/asm-sh/machtypes.h
 
 all: zImage
@@ -168,14 +168,7 @@ compressed: zImage
 archclean:
         $(Q)$(MAKE) $(clean)=$(boot)
 
-CLEAN_FILES += include/asm-sh/machtypes.h include/asm-sh/asm-offsets.h
-
-arch/sh/kernel/asm-offsets.s: include/asm include/linux/version.h \
-                              include/asm-sh/.cpu include/asm-sh/.mach
-
-include/asm-sh/asm-offsets.h: arch/sh/kernel/asm-offsets.s
-        $(call filechk,gen-asm-offsets)
-
+CLEAN_FILES += include/asm-sh/machtypes.h
 
 define archhelp
         @echo '  zImage                    - Compressed kernel image (arch/sh/boot/zImage)'
diff --git a/arch/sh/boards/adx/irq_maskreg.c b/arch/sh/boards/adx/irq_maskreg.c
index ca91bb0f1f5c..c0973f8d57ba 100644
--- a/arch/sh/boards/adx/irq_maskreg.c
+++ b/arch/sh/boards/adx/irq_maskreg.c
@@ -37,13 +37,13 @@ static void end_maskreg_irq(unsigned int irq);
 
 /* hw_interrupt_type */
 static struct hw_interrupt_type maskreg_irq_type = {
-        " Mask Register",
-        startup_maskreg_irq,
-        shutdown_maskreg_irq,
-        enable_maskreg_irq,
-        disable_maskreg_irq,
-        mask_and_ack_maskreg,
-        end_maskreg_irq
+        .typename = " Mask Register",
+        .startup = startup_maskreg_irq,
+        .shutdown = shutdown_maskreg_irq,
+        .enable = enable_maskreg_irq,
+        .disable = disable_maskreg_irq,
+        .ack = mask_and_ack_maskreg,
+        .end = end_maskreg_irq
 };
 
 /* actual implementatin */
diff --git a/arch/sh/boards/bigsur/io.c b/arch/sh/boards/bigsur/io.c
index 697144de7419..a9fde781b21a 100644
--- a/arch/sh/boards/bigsur/io.c
+++ b/arch/sh/boards/bigsur/io.c
@@ -37,10 +37,6 @@ static u8 bigsur_iomap_lo_shift[BIGSUR_IOMAP_LO_NMAP];
 static u32 bigsur_iomap_hi[BIGSUR_IOMAP_HI_NMAP];
 static u8 bigsur_iomap_hi_shift[BIGSUR_IOMAP_HI_NMAP];
 
-#ifndef MAX
-#define MAX(a,b)    ((a)>(b)?(a):(b))
-#endif
-
 void bigsur_port_map(u32 baseport, u32 nports, u32 addr, u8 shift)
 {
         u32 port, endport = baseport + nports;
@@ -57,7 +53,7 @@ void bigsur_port_map(u32 baseport, u32 nports, u32 addr, u8 shift)
                 addr += (1<<(BIGSUR_IOMAP_LO_SHIFT));
         }
 
-        for (port = MAX(baseport, BIGSUR_IOMAP_LO_THRESH) ;
+        for (port = max_t(u32, baseport, BIGSUR_IOMAP_LO_THRESH);
              port < endport && port < BIGSUR_IOMAP_HI_THRESH ;
              port += (1<<BIGSUR_IOMAP_HI_SHIFT)) {
                 pr_debug("    maphi[0x%x] = 0x%08x\n", port, addr);
@@ -80,7 +76,7 @@ void bigsur_port_unmap(u32 baseport, u32 nports)
                 bigsur_iomap_lo[port>>BIGSUR_IOMAP_LO_SHIFT] = 0;
         }
 
-        for (port = MAX(baseport, BIGSUR_IOMAP_LO_THRESH) ;
+        for (port = max_t(u32, baseport, BIGSUR_IOMAP_LO_THRESH);
              port < endport && port < BIGSUR_IOMAP_HI_THRESH ;
              port += (1<<BIGSUR_IOMAP_HI_SHIFT)) {
                 bigsur_iomap_hi[port>>BIGSUR_IOMAP_HI_SHIFT] = 0;
diff --git a/arch/sh/boards/bigsur/irq.c b/arch/sh/boards/bigsur/irq.c
index c188fc32dc9a..6ddbcc77244d 100644
--- a/arch/sh/boards/bigsur/irq.c
+++ b/arch/sh/boards/bigsur/irq.c
@@ -228,23 +228,23 @@ static void shutdown_bigsur_irq(unsigned int irq)
 
 /* Define the IRQ structures for the L1 and L2 IRQ types */
 static struct hw_interrupt_type bigsur_l1irq_type = {
-        "BigSur-CPLD-Level1-IRQ",
-        startup_bigsur_irq,
-        shutdown_bigsur_irq,
-        enable_bigsur_l1irq,
-        disable_bigsur_l1irq,
-        mask_and_ack_bigsur,
-        end_bigsur_irq
+        .typename  = "BigSur-CPLD-Level1-IRQ",
+        .startup = startup_bigsur_irq,
+        .shutdown = shutdown_bigsur_irq,
+        .enable = enable_bigsur_l1irq,
+        .disable = disable_bigsur_l1irq,
+        .ack = mask_and_ack_bigsur,
+        .end = end_bigsur_irq
 };
 
 static struct hw_interrupt_type bigsur_l2irq_type = {
-        "BigSur-CPLD-Level2-IRQ",
-        startup_bigsur_irq,
-        shutdown_bigsur_irq,
-        enable_bigsur_l2irq,
-        disable_bigsur_l2irq,
-        mask_and_ack_bigsur,
-        end_bigsur_irq
+        .typename  = "BigSur-CPLD-Level2-IRQ",
+        .startup = startup_bigsur_irq,
+        .shutdown  =shutdown_bigsur_irq,
+        .enable = enable_bigsur_l2irq,
+        .disable = disable_bigsur_l2irq,
+        .ack = mask_and_ack_bigsur,
+        .end = end_bigsur_irq
 };
 
 
diff --git a/arch/sh/boards/cqreek/irq.c b/arch/sh/boards/cqreek/irq.c
index fa6cfe5a20a7..d1da0d844567 100644
--- a/arch/sh/boards/cqreek/irq.c
+++ b/arch/sh/boards/cqreek/irq.c
@@ -83,13 +83,13 @@ static void shutdown_cqreek_irq(unsigned int irq)
 }
 
 static struct hw_interrupt_type cqreek_irq_type = {
-        "CqREEK-IRQ",
-        startup_cqreek_irq,
-        shutdown_cqreek_irq,
-        enable_cqreek_irq,
-        disable_cqreek_irq,
-        mask_and_ack_cqreek,
-        end_cqreek_irq
+        .typename = "CqREEK-IRQ",
+        .startup = startup_cqreek_irq,
+        .shutdown = shutdown_cqreek_irq,
+        .enable = enable_cqreek_irq,
+        .disable = disable_cqreek_irq,
+        .ack = mask_and_ack_cqreek,
+        .end = end_cqreek_irq
 };
 
 int cqreek_has_ide, cqreek_has_isa;
diff --git a/arch/sh/boards/harp/irq.c b/arch/sh/boards/harp/irq.c
index acd58489970f..52d0ba39031b 100644
--- a/arch/sh/boards/harp/irq.c
+++ b/arch/sh/boards/harp/irq.c
@@ -39,13 +39,13 @@ static unsigned int startup_harp_irq(unsigned int irq)
 }
 
 static struct hw_interrupt_type harp_irq_type = {
-        "Harp-IRQ",
-        startup_harp_irq,
-        shutdown_harp_irq,
-        enable_harp_irq,
-        disable_harp_irq,
-        mask_and_ack_harp,
-        end_harp_irq
+        .typename = "Harp-IRQ",
+        .startup = startup_harp_irq,
+        .shutdown = shutdown_harp_irq,
+        .enable = enable_harp_irq,
+        .disable = disable_harp_irq,
+        .ack = mask_and_ack_harp,
+        .end = end_harp_irq
 };
 
 static void disable_harp_irq(unsigned int irq)
diff --git a/arch/sh/boards/overdrive/irq.c b/arch/sh/boards/overdrive/irq.c
index 23adc6be71e7..715e8feb3a68 100644
--- a/arch/sh/boards/overdrive/irq.c
+++ b/arch/sh/boards/overdrive/irq.c
@@ -86,13 +86,13 @@ static unsigned int startup_od_irq(unsigned int irq)
 }
 
 static struct hw_interrupt_type od_irq_type = {
-        "Overdrive-IRQ",
-        startup_od_irq,
-        shutdown_od_irq,
-        enable_od_irq,
-        disable_od_irq,
-        mask_and_ack_od,
-        end_od_irq
+        .typename = "Overdrive-IRQ",
+        .startup = startup_od_irq,
+        .shutdown = shutdown_od_irq,
+        .enable = enable_od_irq,
+        .disable = disable_od_irq,
+        .ack = mask_and_ack_od,
+        .end = end_od_irq
 };
 
 static void disable_od_irq(unsigned int irq)
diff --git a/arch/sh/boards/renesas/hs7751rvoip/irq.c b/arch/sh/boards/renesas/hs7751rvoip/irq.c
index a7921f67a35f..ed4c5b50ea45 100644
--- a/arch/sh/boards/renesas/hs7751rvoip/irq.c
+++ b/arch/sh/boards/renesas/hs7751rvoip/irq.c
@@ -74,13 +74,13 @@ static void end_hs7751rvoip_irq(unsigned int irq)
 }
 
 static struct hw_interrupt_type hs7751rvoip_irq_type = {
-        "HS7751RVoIP IRQ",
-        startup_hs7751rvoip_irq,
-        shutdown_hs7751rvoip_irq,
-        enable_hs7751rvoip_irq,
-        disable_hs7751rvoip_irq,
-        ack_hs7751rvoip_irq,
-        end_hs7751rvoip_irq,
+        .typename =  "HS7751RVoIP IRQ",
+        .startup = startup_hs7751rvoip_irq,
+        .shutdown = shutdown_hs7751rvoip_irq,
+        .enable = enable_hs7751rvoip_irq,
+        .disable = disable_hs7751rvoip_irq,
+        .ack = ack_hs7751rvoip_irq,
+        .end = end_hs7751rvoip_irq,
 };
 
 static void make_hs7751rvoip_irq(unsigned int irq)
diff --git a/arch/sh/boards/renesas/rts7751r2d/irq.c b/arch/sh/boards/renesas/rts7751r2d/irq.c
index 95717f4f1e2d..d36c9374aed1 100644
--- a/arch/sh/boards/renesas/rts7751r2d/irq.c
+++ b/arch/sh/boards/renesas/rts7751r2d/irq.c
@@ -88,13 +88,13 @@ static void end_rts7751r2d_irq(unsigned int irq)
 }
 
 static struct hw_interrupt_type rts7751r2d_irq_type = {
-        "RTS7751R2D IRQ",
-        startup_rts7751r2d_irq,
-        shutdown_rts7751r2d_irq,
-        enable_rts7751r2d_irq,
-        disable_rts7751r2d_irq,
-        ack_rts7751r2d_irq,
-        end_rts7751r2d_irq,
+        .typename = "RTS7751R2D IRQ",
+        .startup = startup_rts7751r2d_irq,
+        .shutdown = shutdown_rts7751r2d_irq,
+        .enable = enable_rts7751r2d_irq,
+        .disable = disable_rts7751r2d_irq,
+        .ack = ack_rts7751r2d_irq,
+        .end = end_rts7751r2d_irq,
 };
 
 static void make_rts7751r2d_irq(unsigned int irq)
diff --git a/arch/sh/boards/renesas/systemh/irq.c b/arch/sh/boards/renesas/systemh/irq.c
index 5675a4134eee..7a2eb10edb56 100644
--- a/arch/sh/boards/renesas/systemh/irq.c
+++ b/arch/sh/boards/renesas/systemh/irq.c
@@ -35,13 +35,13 @@ static void end_systemh_irq(unsigned int irq);
 
 /* hw_interrupt_type */
 static struct hw_interrupt_type systemh_irq_type = {
-        " SystemH Register",
-        startup_systemh_irq,
-        shutdown_systemh_irq,
-        enable_systemh_irq,
-        disable_systemh_irq,
-        mask_and_ack_systemh,
-        end_systemh_irq
+        .typename = " SystemH Register",
+        .startup = startup_systemh_irq,
+        .shutdown = shutdown_systemh_irq,
+        .enable = enable_systemh_irq,
+        .disable = disable_systemh_irq,
+        .ack = mask_and_ack_systemh,
+        .end = end_systemh_irq
 };
 
 static unsigned int startup_systemh_irq(unsigned int irq)
diff --git a/arch/sh/boards/superh/microdev/irq.c b/arch/sh/boards/superh/microdev/irq.c
index 1298883eca4b..1395c1e65da4 100644
--- a/arch/sh/boards/superh/microdev/irq.c
+++ b/arch/sh/boards/superh/microdev/irq.c
@@ -83,13 +83,13 @@ static unsigned int startup_microdev_irq(unsigned int irq)
 }
 
 static struct hw_interrupt_type microdev_irq_type = {
-        "MicroDev-IRQ",
-        startup_microdev_irq,
-        shutdown_microdev_irq,
-        enable_microdev_irq,
-        disable_microdev_irq,
-        mask_and_ack_microdev,
-        end_microdev_irq
+        .typename = "MicroDev-IRQ",
+        .startup = startup_microdev_irq,
+        .shutdown = shutdown_microdev_irq,
+        .enable = enable_microdev_irq,
+        .disable = disable_microdev_irq,
+        .ack = mask_and_ack_microdev,
+        .end = end_microdev_irq
 };
 
 static void disable_microdev_irq(unsigned int irq)
diff --git a/arch/sh/cchips/hd6446x/hd64465/io.c b/arch/sh/cchips/hd6446x/hd64465/io.c
index 99ac709c550e..84cb142def0b 100644
--- a/arch/sh/cchips/hd6446x/hd64465/io.c
+++ b/arch/sh/cchips/hd6446x/hd64465/io.c
@@ -48,10 +48,6 @@ static unsigned char	hd64465_iomap_lo_shift[HD64465_IOMAP_LO_NMAP];
 static unsigned long    hd64465_iomap_hi[HD64465_IOMAP_HI_NMAP];
 static unsigned char    hd64465_iomap_hi_shift[HD64465_IOMAP_HI_NMAP];
 
-#ifndef MAX
-#define MAX(a,b)    ((a)>(b)?(a):(b))
-#endif
-
 #define PORT2ADDR(x) (sh_mv.mv_isa_port2addr(x))
 
 void hd64465_port_map(unsigned short baseport, unsigned int nports,
@@ -71,7 +67,7 @@ void hd64465_port_map(unsigned short baseport, unsigned int nports,
             addr += (1<<(HD64465_IOMAP_LO_SHIFT));
         }
 
-        for (port = MAX(baseport, HD64465_IOMAP_LO_THRESH) ;
+        for (port = max_t(unsigned int, baseport, HD64465_IOMAP_LO_THRESH);
              port < endport && port < HD64465_IOMAP_HI_THRESH ;
              port += (1<<HD64465_IOMAP_HI_SHIFT)) {
             DPRINTK("    maphi[0x%x] = 0x%08lx\n", port, addr);
@@ -95,7 +91,7 @@ void hd64465_port_unmap(unsigned short baseport, unsigned int nports)
             hd64465_iomap_lo[port>>HD64465_IOMAP_LO_SHIFT] = 0;
         }
 
-        for (port = MAX(baseport, HD64465_IOMAP_LO_THRESH) ;
+        for (port = max_t(unsigned int, baseport, HD64465_IOMAP_LO_THRESH);
              port < endport && port < HD64465_IOMAP_HI_THRESH ;
              port += (1<<HD64465_IOMAP_HI_SHIFT)) {
             hd64465_iomap_hi[port>>HD64465_IOMAP_HI_SHIFT] = 0;
diff --git a/arch/sh/cchips/voyagergx/irq.c b/arch/sh/cchips/voyagergx/irq.c
index 3079234cb65b..1b6ac523b458 100644
--- a/arch/sh/cchips/voyagergx/irq.c
+++ b/arch/sh/cchips/voyagergx/irq.c
@@ -87,13 +87,13 @@ static void shutdown_voyagergx_irq(unsigned int irq)
 }
 
 static struct hw_interrupt_type voyagergx_irq_type = {
-        "VOYAGERGX-IRQ",
-        startup_voyagergx_irq,
-        shutdown_voyagergx_irq,
-        enable_voyagergx_irq,
-        disable_voyagergx_irq,
-        mask_and_ack_voyagergx,
-        end_voyagergx_irq,
+        .typename = "VOYAGERGX-IRQ",
+        .startup = startup_voyagergx_irq,
+        .shutdown = shutdown_voyagergx_irq,
+        .enable = enable_voyagergx_irq,
+        .disable = disable_voyagergx_irq,
+        .ack = mask_and_ack_voyagergx,
+        .end = end_voyagergx_irq,
 };
 
 static irqreturn_t voyagergx_interrupt(int irq, void *dev_id, struct pt_regs *regs)
diff --git a/arch/sh/kernel/cpu/irq_imask.c b/arch/sh/kernel/cpu/irq_imask.c
index f76901e732fb..a963d00a971e 100644
--- a/arch/sh/kernel/cpu/irq_imask.c
+++ b/arch/sh/kernel/cpu/irq_imask.c
@@ -46,13 +46,13 @@ static unsigned int startup_imask_irq(unsigned int irq)
 }
 
 static struct hw_interrupt_type imask_irq_type = {
-        "SR.IMASK",
-        startup_imask_irq,
-        shutdown_imask_irq,
-        enable_imask_irq,
-        disable_imask_irq,
-        mask_and_ack_imask,
-        end_imask_irq
+        .typename = "SR.IMASK",
+        .startup = startup_imask_irq,
+        .shutdown = shutdown_imask_irq,
+        .enable = enable_imask_irq,
+        .disable = disable_imask_irq,
+        .ack = mask_and_ack_imask,
+        .end = end_imask_irq
 };
 
 void static inline set_interrupt_registers(int ip)
diff --git a/arch/sh/kernel/cpu/irq_ipr.c b/arch/sh/kernel/cpu/irq_ipr.c
index 7ea3d2d030e5..71f92096132b 100644
--- a/arch/sh/kernel/cpu/irq_ipr.c
+++ b/arch/sh/kernel/cpu/irq_ipr.c
@@ -48,13 +48,13 @@ static unsigned int startup_ipr_irq(unsigned int irq)
 }
 
 static struct hw_interrupt_type ipr_irq_type = {
-        "IPR-IRQ",
-        startup_ipr_irq,
-        shutdown_ipr_irq,
-        enable_ipr_irq,
-        disable_ipr_irq,
-        mask_and_ack_ipr,
-        end_ipr_irq
+        .typename = "IPR-IRQ",
+        .startup = startup_ipr_irq,
+        .shutdown = shutdown_ipr_irq,
+        .enable = enable_ipr_irq,
+        .disable = disable_ipr_irq,
+        .ack = mask_and_ack_ipr,
+        .end = end_ipr_irq
 };
 
 static void disable_ipr_irq(unsigned int irq)
@@ -142,13 +142,13 @@ static unsigned int startup_pint_irq(unsigned int irq)
 }
 
 static struct hw_interrupt_type pint_irq_type = {
-        "PINT-IRQ",
-        startup_pint_irq,
-        shutdown_pint_irq,
-        enable_pint_irq,
-        disable_pint_irq,
-        mask_and_ack_pint,
-        end_pint_irq
+        .typename = "PINT-IRQ",
+        .startup = startup_pint_irq,
+        .shutdown = shutdown_pint_irq,
+        .enable = enable_pint_irq,
+        .disable = disable_pint_irq,
+        .ack = mask_and_ack_pint,
+        .end = end_pint_irq
 };
 
 static void disable_pint_irq(unsigned int irq)
diff --git a/arch/sh/kernel/cpu/sh4/irq_intc2.c b/arch/sh/kernel/cpu/sh4/irq_intc2.c
index 099ebbf89745..f6b16ba01932 100644
--- a/arch/sh/kernel/cpu/sh4/irq_intc2.c
+++ b/arch/sh/kernel/cpu/sh4/irq_intc2.c
@@ -48,13 +48,13 @@ static unsigned int startup_intc2_irq(unsigned int irq)
 }
 
 static struct hw_interrupt_type intc2_irq_type = {
-        "INTC2-IRQ",
-        startup_intc2_irq,
-        shutdown_intc2_irq,
-        enable_intc2_irq,
-        disable_intc2_irq,
-        mask_and_ack_intc2,
-        end_intc2_irq
+        .typename = "INTC2-IRQ",
+        .startup = startup_intc2_irq,
+        .shutdown = shutdown_intc2_irq,
+        .enable = enable_intc2_irq,
+        .disable = disable_intc2_irq,
+        .ack = mask_and_ack_intc2,
+        .end = end_intc2_irq
 };
 
 static void disable_intc2_irq(unsigned int irq)