Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

Pull MIPS updates from Ralf Baechle:
 - three fixes for 3.15 that didn't make it in time
 - limited Octeon 3 support.
 - paravirtualization support
 - improvment to platform support for Netlogix SOCs.
 - add support for powering down the Malta eval board in software
 - add many instructions to the in-kernel microassembler.
 - add support for the BPF JIT.
 - minor cleanups of the BCM47xx code.
 - large cleanup of math emu code resulting in significant code size
   reduction, better readability of the code and more accurate
   emulation.
 - improvments to the MIPS CPS code.
 - support C3 power status for the R4k count/compare clock device.
 - improvments to the GIO support for older SGI workstations.
 - increase number of supported CPUs to 256; this can be reached on
   certain embedded multithreaded ccNUMA configurations.
 - various small cleanups, updates and fixes

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (173 commits)
  MIPS: IP22/IP28: Improve GIO support
  MIPS: Octeon: Add twsi interrupt initialization for OCTEON 3XXX, 5XXX, 63XX
  DEC: Document the R4k MB ASIC mini interrupt controller
  DEC: Add self as the maintainer
  MIPS: Add microMIPS MSA support.
  MIPS: Replace calls to obsolete strict_strto call with kstrto* equivalents.
  MIPS: Replace obsolete strict_strto call with kstrto
  MIPS: BFP: Simplify code slightly.
  MIPS: Call find_vma with the mmap_sem held
  MIPS: Fix 'write_msa_##' inline macro.
  MIPS: Fix MSA toolchain support detection.
  mips: Update the email address of Geert Uytterhoeven
  MIPS: Add minimal defconfig for mips_paravirt
  MIPS: Enable build for new system 'paravirt'
  MIPS: paravirt: Add pci controller for virtio
  MIPS: Add code for new system 'paravirt'
  MIPS: Add functions for hypervisor call
  MIPS: OCTEON: Add OCTEON3 to __get_cpu_type
  MIPS: Add function get_ebase_cpunum
  MIPS: Add minimal support for OCTEON3 to c-r4k.c
  ...

1 files changed, 13 insertions, 23 deletions

diff --git a/arch/mips/mti-sead3/sead3-pic32-i2c-drv.c b/arch/mips/mti-sead3/sead3-pic32-i2c-drv.c
index b921e5ec507c..80fe194cfa53 100644
--- a/arch/mips/mti-sead3/sead3-pic32-i2c-drv.c
+++ b/arch/mips/mti-sead3/sead3-pic32-i2c-drv.c
@@ -312,16 +312,13 @@ static int i2c_platform_probe(struct platform_device *pdev)
 
         pr_debug("i2c_platform_probe\n");
         r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (!r) {
-                ret = -ENODEV;
-                goto out;
-        }
+        if (!r)
+                return -ENODEV;
 
-        priv = kzalloc(sizeof(struct i2c_platform_data), GFP_KERNEL);
-        if (!priv) {
-                ret = -ENOMEM;
-                goto out;
-        }
+        priv = devm_kzalloc(&pdev->dev, sizeof(struct i2c_platform_data),
+                            GFP_KERNEL);
+        if (!priv)
+                return -ENOMEM;
 
         /* FIXME: need to allocate resource in PIC32 space */
 #if 0
@@ -330,10 +327,8 @@ static int i2c_platform_probe(struct platform_device *pdev)
 #else
         priv->base = r->start;
 #endif
-        if (!priv->base) {
-                ret = -EBUSY;
-                goto out_mem;
-        }
+        if (!priv->base)
+                return -EBUSY;
 
         priv->xfer_timeout = 200;
         priv->ack_timeout = 200;
@@ -348,17 +343,13 @@ static int i2c_platform_probe(struct platform_device *pdev)
         i2c_platform_setup(priv);
 
         ret = i2c_add_numbered_adapter(&priv->adap);
-        if (ret == 0) {
-                platform_set_drvdata(pdev, priv);
-                return 0;
+        if (ret) {
+                i2c_platform_disable(priv);
+                return ret;
         }
 
-        i2c_platform_disable(priv);
-
-out_mem:
-        kfree(priv);
-out:
-        return ret;
+        platform_set_drvdata(pdev, priv);
+        return 0;
 }
 
 static int i2c_platform_remove(struct platform_device *pdev)
@@ -369,7 +360,6 @@ static int i2c_platform_remove(struct platform_device *pdev)
         platform_set_drvdata(pdev, NULL);
         i2c_del_adapter(&priv->adap);
         i2c_platform_disable(priv);
-        kfree(priv);
         return 0;
 }