[PATCH] H8/300 support update (2/3): compiler warnings

o gcc-3.4 warning fix.

arch/h8300/platform/h8300h/ints.c

@@ -140,8 +140,9 @@ int request_irq(unsigned int irq,
 	if (use_kmalloc)
 		irq_handle = (irq_handler_t *)kmalloc(sizeof(irq_handler_t), GFP_ATOMIC);
 	else {
-		irq_handle = alloc_bootmem(sizeof(irq_handler_t));
-		(unsigned long)irq_handle |= 0x80000000; /* bootmem allocater */
+		/* use bootmem allocater */
+		irq_handle = (irq_handler_t *)alloc_bootmem(sizeof(irq_handler_t));
+		irq_handle = (irq_handler_t *)((unsigned long)irq_handle | 0x80000000);
 	}
 
 	if (irq_handle == NULL)
@@ -230,12 +231,10 @@ int show_interrupts(struct seq_file *p, void *v)
 {
 	int i = *(loff_t *) v;
 
-	if (i < NR_IRQS) {
-		if (irq_list[i]) {
+	if ((i < NR_IRQS) && (irq_list[i]!=NULL)) {
 		seq_printf(p, "%3d: %10u ",i,irq_list[i]->count);
 		seq_printf(p, "%s\n", irq_list[i]->devname);
 	}
-	}
 
 	return 0;
 }

arch/h8300/platform/h8s/ints.c

@@ -178,8 +178,9 @@ int request_irq(unsigned int irq,
 	if (use_kmalloc)
 		irq_handle = (irq_handler_t *)kmalloc(sizeof(irq_handler_t), GFP_ATOMIC);
 	else {
-		irq_handle = alloc_bootmem(sizeof(irq_handler_t));
-		(unsigned long)irq_handle |= 0x80000000; /* bootmem allocater */
+		/* use bootmem allocater */
+		irq_handle = (irq_handler_t *)alloc_bootmem(sizeof(irq_handler_t));
+		irq_handle = (irq_handler_t *)((unsigned long)irq_handle | 0x80000000);
 	}
 
 	if (irq_handle == NULL)
@@ -282,12 +283,10 @@ int show_interrupts(struct seq_file *p, void *v)
 {
 	int i = *(loff_t *) v;
 
-	if (i < NR_IRQS) {
-		if (irq_list[i]) {
+	if ((i < NR_IRQS) && (irq_list[i] !=NULL)) {
 		seq_printf(p, "%3d: %10u ",i,irq_list[i]->count);
 		seq_printf(p, "%s\n", irq_list[i]->devname);
 	}
-	}
 
 	return 0;
 }