Merge branch 'merge' into next

Merge my own merge branch to get various fixes from there
and upstream, especially the hvc console tty refcouting fixes
which which testing is quite a bit harder...

3 files changed, 18 insertions, 16 deletions

diff --git a/drivers/of/address.c b/drivers/of/address.c
index 72e496f1e9b0..0125524c08c4 100644
--- a/drivers/of/address.c
+++ b/drivers/of/address.c
@@ -37,9 +37,9 @@ struct of_bus {
         int             (*match)(struct device_node *parent);
         void            (*count_cells)(struct device_node *child,
                                        int *addrc, int *sizec);
-        u64             (*map)(u32 *addr, const __be32 *range,
+        u64             (*map)(__be32 *addr, const __be32 *range,
                                 int na, int ns, int pna);
-        int             (*translate)(u32 *addr, u64 offset, int na);
+        int             (*translate)(__be32 *addr, u64 offset, int na);
         unsigned int    (*get_flags)(const __be32 *addr);
 };
 
@@ -56,7 +56,7 @@ static void of_bus_default_count_cells(struct device_node *dev,
                 *sizec = of_n_size_cells(dev);
 }
 
-static u64 of_bus_default_map(u32 *addr, const __be32 *range,
+static u64 of_bus_default_map(__be32 *addr, const __be32 *range,
                 int na, int ns, int pna)
 {
         u64 cp, s, da;
@@ -82,7 +82,7 @@ static u64 of_bus_default_map(u32 *addr, const __be32 *range,
         return da - cp;
 }
 
-static int of_bus_default_translate(u32 *addr, u64 offset, int na)
+static int of_bus_default_translate(__be32 *addr, u64 offset, int na)
 {
         u64 a = of_read_number(addr, na);
         memset(addr, 0, na * 4);
@@ -138,7 +138,7 @@ static unsigned int of_bus_pci_get_flags(const __be32 *addr)
         return flags;
 }
 
-static u64 of_bus_pci_map(u32 *addr, const __be32 *range, int na, int ns,
+static u64 of_bus_pci_map(__be32 *addr, const __be32 *range, int na, int ns,
                 int pna)
 {
         u64 cp, s, da;
@@ -165,7 +165,7 @@ static u64 of_bus_pci_map(u32 *addr, const __be32 *range, int na, int ns,
         return da - cp;
 }
 
-static int of_bus_pci_translate(u32 *addr, u64 offset, int na)
+static int of_bus_pci_translate(__be32 *addr, u64 offset, int na)
 {
         return of_bus_default_translate(addr + 1, offset, na - 1);
 }
@@ -247,7 +247,7 @@ static void of_bus_isa_count_cells(struct device_node *child,
                 *sizec = 1;
 }
 
-static u64 of_bus_isa_map(u32 *addr, const __be32 *range, int na, int ns,
+static u64 of_bus_isa_map(__be32 *addr, const __be32 *range, int na, int ns,
                 int pna)
 {
         u64 cp, s, da;
@@ -270,7 +270,7 @@ static u64 of_bus_isa_map(u32 *addr, const __be32 *range, int na, int ns,
         return da - cp;
 }
 
-static int of_bus_isa_translate(u32 *addr, u64 offset, int na)
+static int of_bus_isa_translate(__be32 *addr, u64 offset, int na)
 {
         return of_bus_default_translate(addr + 1, offset, na - 1);
 }
@@ -338,7 +338,7 @@ static struct of_bus *of_match_bus(struct device_node *np)
 }
 
 static int of_translate_one(struct device_node *parent, struct of_bus *bus,
-                            struct of_bus *pbus, u32 *addr,
+                            struct of_bus *pbus, __be32 *addr,
                             int na, int ns, int pna, const char *rprop)
 {
         const __be32 *ranges;
@@ -409,12 +409,12 @@ static int of_translate_one(struct device_node *parent, struct of_bus *bus,
  * that can be mapped to a cpu physical address). This is not really specified
  * that way, but this is traditionally the way IBM at least do things
  */
-u64 __of_translate_address(struct device_node *dev, const __be32 *in_addr,
-                           const char *rprop)
+static u64 __of_translate_address(struct device_node *dev,
+                                  const __be32 *in_addr, const char *rprop)
 {
         struct device_node *parent = NULL;
         struct of_bus *bus, *pbus;
-        u32 addr[OF_MAX_ADDR_CELLS];
+        __be32 addr[OF_MAX_ADDR_CELLS];
         int na, ns, pna, pns;
         u64 result = OF_BAD_ADDR;
 
diff --git a/drivers/of/irq.c b/drivers/of/irq.c
index a23ec7779997..a3c1c5aae6a9 100644
--- a/drivers/of/irq.c
+++ b/drivers/of/irq.c
@@ -192,11 +192,13 @@ int of_irq_map_raw(struct device_node *parent, const __be32 *intspec,
                         /* Compare specifiers */
                         match = 1;
                         for (i = 0; i < addrsize && match; ++i) {
-                                u32 mask = imask ? imask[i] : 0xffffffffu;
+                                __be32 mask = imask ? imask[i]
+                                                    : cpu_to_be32(0xffffffffu);
                                 match = ((addr[i] ^ imap[i]) & mask) == 0;
                         }
                         for (; i < (addrsize + intsize) && match; ++i) {
-                                u32 mask = imask ? imask[i] : 0xffffffffu;
+                                __be32 mask = imask ? imask[i]
+                                                    : cpu_to_be32(0xffffffffu);
                                 match =
                                    ((intspec[i-addrsize] ^ imap[i]) & mask) == 0;
                         }
@@ -465,7 +467,7 @@ void __init of_irq_init(const struct of_device_id *matches)
                         pr_debug("of_irq_init: init %s @ %p, parent %p\n",
                                  match->compatible,
                                  desc->dev, desc->interrupt_parent);
-                        irq_init_cb = match->data;
+                        irq_init_cb = (of_irq_init_cb_t)match->data;
                         ret = irq_init_cb(desc->dev, desc->interrupt_parent);
                         if (ret) {
                                 kfree(desc);
diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index 9bdeaf30b17d..b80891b43816 100644
--- a/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@ -76,7 +76,7 @@ void of_device_make_bus_id(struct device *dev)
 {
         static atomic_t bus_no_reg_magic;
         struct device_node *node = dev->of_node;
-        const u32 *reg;
+        const __be32 *reg;
         u64 addr;
         const __be32 *addrp;
         int magic;