Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

Pull sparc fixes from David Miller:

 1) Some implicit switch fallthrough fixes from Stephen Rothwell.

 2) Missing of_node_put() in various sparc drivers from Yangtao Li.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  drivers/tty: add missing of_node_put()
  drivers/sbus/char: add of_node_put()
  sbus: char: add of_node_put()
  sparc32: supress another implicit-fallthrough warning
  sparc32: suppress an implicit-fallthrough warning
  sparc: suppress the implicit-fallthrough warning
  arch/sparc: Use kzalloc_node

7 files changed, 8 insertions, 2 deletions

diff --git a/arch/sparc/kernel/iommu.c b/arch/sparc/kernel/iommu.c
index 40d008b0bd3e..05eb016fc41b 100644
--- a/arch/sparc/kernel/iommu.c
+++ b/arch/sparc/kernel/iommu.c
@@ -108,10 +108,9 @@ int iommu_table_init(struct iommu *iommu, int tsbsize,
         /* Allocate and initialize the free area map.  */
         sz = num_tsb_entries / 8;
         sz = (sz + 7UL) & ~7UL;
-        iommu->tbl.map = kmalloc_node(sz, GFP_KERNEL, numa_node);
+        iommu->tbl.map = kzalloc_node(sz, GFP_KERNEL, numa_node);
         if (!iommu->tbl.map)
                 return -ENOMEM;
-        memset(iommu->tbl.map, 0, sz);
 
         iommu_tbl_pool_init(&iommu->tbl, num_tsb_entries, IO_PAGE_SHIFT,
                             (tlb_type != hypervisor ? iommu_flushall : NULL),
diff --git a/arch/sparc/kernel/signal32.c b/arch/sparc/kernel/signal32.c
index 4c5b3fcbed94..e800ce13cc6e 100644
--- a/arch/sparc/kernel/signal32.c
+++ b/arch/sparc/kernel/signal32.c
@@ -683,6 +683,7 @@ void do_signal32(struct pt_regs * regs)
                                 regs->tpc -= 4;
                                 regs->tnpc -= 4;
                                 pt_regs_clear_syscall(regs);
+                                /* fall through */
                         case ERESTART_RESTARTBLOCK:
                                 regs->u_regs[UREG_G1] = __NR_restart_syscall;
                                 regs->tpc -= 4;
diff --git a/arch/sparc/kernel/signal_32.c b/arch/sparc/kernel/signal_32.c
index 5665261cee37..83953780ca01 100644
--- a/arch/sparc/kernel/signal_32.c
+++ b/arch/sparc/kernel/signal_32.c
@@ -508,6 +508,7 @@ static void do_signal(struct pt_regs *regs, unsigned long orig_i0)
                                 regs->pc -= 4;
                                 regs->npc -= 4;
                                 pt_regs_clear_syscall(regs);
+                                /* fall through */
                         case ERESTART_RESTARTBLOCK:
                                 regs->u_regs[UREG_G1] = __NR_restart_syscall;
                                 regs->pc -= 4;
diff --git a/arch/sparc/kernel/signal_64.c b/arch/sparc/kernel/signal_64.c
index e9de1803a22e..ca70787efd8e 100644
--- a/arch/sparc/kernel/signal_64.c
+++ b/arch/sparc/kernel/signal_64.c
@@ -533,6 +533,7 @@ static void do_signal(struct pt_regs *regs, unsigned long orig_i0)
                                 regs->tpc -= 4;
                                 regs->tnpc -= 4;
                                 pt_regs_clear_syscall(regs);
+                                /* fall through */
                         case ERESTART_RESTARTBLOCK:
                                 regs->u_regs[UREG_G1] = __NR_restart_syscall;
                                 regs->tpc -= 4;
diff --git a/drivers/sbus/char/display7seg.c b/drivers/sbus/char/display7seg.c
index 5c8ed7350a04..a36e4cf1841d 100644
--- a/drivers/sbus/char/display7seg.c
+++ b/drivers/sbus/char/display7seg.c
@@ -220,6 +220,7 @@ static int d7s_probe(struct platform_device *op)
         dev_set_drvdata(&op->dev, p);
         d7s_device = p;
         err = 0;
+        of_node_put(opts);
 
 out:
         return err;
diff --git a/drivers/sbus/char/envctrl.c b/drivers/sbus/char/envctrl.c
index 56e962a01493..b8481927bfe4 100644
--- a/drivers/sbus/char/envctrl.c
+++ b/drivers/sbus/char/envctrl.c
@@ -910,8 +910,10 @@ static void envctrl_init_i2c_child(struct device_node *dp,
                         for (len = 0; len < PCF8584_MAX_CHANNELS; ++len) {
                                 pchild->mon_type[len] = ENVCTRL_NOMON;
                         }
+                        of_node_put(root_node);
                         return;
                 }
+                of_node_put(root_node);
         }
 
         /* Get the monitor channels. */
diff --git a/drivers/tty/serial/suncore.c b/drivers/tty/serial/suncore.c
index 70a4ea4eaa6e..990376576970 100644
--- a/drivers/tty/serial/suncore.c
+++ b/drivers/tty/serial/suncore.c
@@ -112,6 +112,7 @@ void sunserial_console_termios(struct console *con, struct device_node *uart_dp)
                 mode = of_get_property(dp, mode_prop, NULL);
                 if (!mode)
                         mode = "9600,8,n,1,-";
+                of_node_put(dp);
         }
 
         cflag = CREAD | HUPCL | CLOCAL;