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

Pull MIPS updates from Ralf Baechle:
 "This is the main pull request for 3.17.  It contains:

   - misc Cavium Octeon, BCM47xx, BCM63xx and Alchemy  updates
   - MIPS ptrace updates and cleanups
   - various fixes that will also go to -stable
   - a number of cleanups and small non-critical fixes.
   - NUMA support for the Loongson 3.
   - more support for MSA
   - support for MAAR
   - various FP enhancements and fixes"

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (139 commits)
  MIPS: jz4740: remove unnecessary null test before debugfs_remove
  MIPS: Octeon: remove unnecessary null test before debugfs_remove_recursive
  MIPS: ZBOOT: implement stack protector in compressed boot phase
  MIPS: mipsreg: remove duplicate MIPS_CONF4_FTLBSETS_SHIFT
  MIPS: Bonito64: remove a duplicate define
  MIPS: Malta: initialise MAARs
  MIPS: Initialise MAARs
  MIPS: detect presence of MAARs
  MIPS: define MAAR register accessors & bits
  MIPS: mark MSA experimental
  MIPS: Don't build MSA support unless it can be used
  MIPS: consistently clear MSA flags when starting & copying threads
  MIPS: 16 byte align MSA vector context
  MIPS: disable preemption whilst initialising MSA
  MIPS: ensure MSA gets disabled during boot
  MIPS: fix read_msa_* & write_msa_* functions on non-MSA toolchains
  MIPS: fix MSA context for tasks which don't use FP first
  MIPS: init upper 64b of vector registers when MSA is first used
  MIPS: save/disable MSA in lose_fpu
  MIPS: preserve scalar FP CSR when switching vector context
  ...

3 files changed, 32 insertions, 15 deletions

diff --git a/arch/mips/txx9/generic/7segled.c b/arch/mips/txx9/generic/7segled.c
index 4642f56e70e5..566c58bd44d0 100644
--- a/arch/mips/txx9/generic/7segled.c
+++ b/arch/mips/txx9/generic/7segled.c
@@ -83,6 +83,11 @@ static struct bus_type tx_7segled_subsys = {
         .dev_name       = "7segled",
 };
 
+static void tx_7segled_release(struct device *dev)
+{
+        kfree(dev);
+}
+
 static int __init tx_7segled_init_sysfs(void)
 {
         int error, i;
@@ -103,11 +108,14 @@ static int __init tx_7segled_init_sysfs(void)
                 }
                 dev->id = i;
                 dev->bus = &tx_7segled_subsys;
+                dev->release = &tx_7segled_release;
                 error = device_register(dev);
-                if (!error) {
-                        device_create_file(dev, &dev_attr_ascii);
-                        device_create_file(dev, &dev_attr_raw);
+                if (error) {
+                        put_device(dev);
+                        return error;
                 }
+                device_create_file(dev, &dev_attr_ascii);
+                device_create_file(dev, &dev_attr_raw);
         }
         return error;
 }
diff --git a/arch/mips/txx9/generic/pci.c b/arch/mips/txx9/generic/pci.c
index 28713274e0cc..a77698ff2b6f 100644
--- a/arch/mips/txx9/generic/pci.c
+++ b/arch/mips/txx9/generic/pci.c
@@ -268,7 +268,7 @@ static int txx9_i8259_irq_setup(int irq)
         return err;
 }
 
-static void quirk_slc90e66_bridge(struct pci_dev *dev)
+static void __init_refok quirk_slc90e66_bridge(struct pci_dev *dev)
 {
         int irq;        /* PCI/ISA Bridge interrupt */
         u8 reg_64;
@@ -331,7 +331,7 @@ static void quirk_slc90e66_ide(struct pci_dev *dev)
          * !!! DO NOT REMOVE THIS COMMENT IT IS REQUIRED BY SMSC !!!
          */
         dat |= 0x01;
-        pci_write_config_byte(dev, regs[i], dat);
+        pci_write_config_byte(dev, 0x5c, dat);
         pci_read_config_byte(dev, 0x5c, &dat);
         printk(KERN_CONT " REG5C %02x", dat);
         printk(KERN_CONT "\n");
diff --git a/arch/mips/txx9/generic/setup.c b/arch/mips/txx9/generic/setup.c
index dd2cf25b5ae5..9ff200ae1c9a 100644
--- a/arch/mips/txx9/generic/setup.c
+++ b/arch/mips/txx9/generic/setup.c
@@ -937,6 +937,14 @@ static ssize_t txx9_sram_write(struct file *filp, struct kobject *kobj,
         return size;
 }
 
+static void txx9_device_release(struct device *dev)
+{
+        struct txx9_sramc_dev *tdev;
+
+        tdev = container_of(dev, struct txx9_sramc_dev, dev);
+        kfree(tdev);
+}
+
 void __init txx9_sramc_init(struct resource *r)
 {
         struct txx9_sramc_dev *dev;
@@ -951,8 +959,11 @@ void __init txx9_sramc_init(struct resource *r)
                 return;
         size = resource_size(r);
         dev->base = ioremap(r->start, size);
-        if (!dev->base)
-                goto exit;
+        if (!dev->base) {
+                kfree(dev);
+                return;
+        }
+        dev->dev.release = &txx9_device_release;
         dev->dev.bus = &txx9_sramc_subsys;
         sysfs_bin_attr_init(&dev->bindata_attr);
         dev->bindata_attr.attr.name = "bindata";
@@ -963,17 +974,15 @@ void __init txx9_sramc_init(struct resource *r)
         dev->bindata_attr.private = dev;
         err = device_register(&dev->dev);
         if (err)
-                goto exit;
+                goto exit_put;
         err = sysfs_create_bin_file(&dev->dev.kobj, &dev->bindata_attr);
         if (err) {
                 device_unregister(&dev->dev);
-                goto exit;
-        }
-        return;
-exit:
-        if (dev) {
-                if (dev->base)
-                        iounmap(dev->base);
+                iounmap(dev->base);
                 kfree(dev);
         }
+        return;
+exit_put:
+        put_device(&dev->dev);
+        return;
 }