architecture/mips64/package/linux/5102_xtalk-misc-cleanups.patch

   1 diff --git a/arch/mips/include/asm/xtalk/xtalk.h b/arch/mips/include/asm/xtalk/xtalk.h
   2 index 9125bd85514d..627ed91b2880 100644
   3 --- a/arch/mips/include/asm/xtalk/xtalk.h
   4 +++ b/arch/mips/include/asm/xtalk/xtalk.h
   5 @@ -21,24 +21,15 @@
   6  #define XWIDGET_MFG_NUM_NONE   -1
   7
   8  /* It is often convenient to fold the XIO target port */
   9 -#define XIO_NOWHERE    (0xFFFFFFFFFFFFFFFFull)
  10 -#define XIO_ADDR_BITS  (0x0000FFFFFFFFFFFFull)
  11 -#define XIO_PORT_BITS  (0xF000000000000000ull)
  12 +#define XIO_NOWHERE    (0xffffffffffffffffULL)
  13 +#define XIO_ADDR_BITS  (0x0000ffffffffffffULL)
  14 +#define XIO_PORT_BITS  (0xf000000000000000ULL)
  15  #define XIO_PORT_SHIFT (60)
  16
  17 -#define XIO_PACKED(x)  (((x)&XIO_PORT_BITS) != 0)
  18 -#define XIO_ADDR(x)    ((x)&XIO_ADDR_BITS)
  19 -#define XIO_PORT(x)    ((s8)(((x)&XIO_PORT_BITS) >> XIO_PORT_SHIFT))
  20 -#define XIO_PACK(p, o) ((((uint64_t)(p))<<XIO_PORT_SHIFT) | ((o)&XIO_ADDR_BITS))
  21 -
  22 -#ifdef CONFIG_PCI
  23 -extern int bridge_probe(nasid_t nasid, int widget, int masterwid);
  24 -#else
  25 -static inline int bridge_probe(nasid_t nasid, int widget, int masterwid)
  26 -{
  27 -       return 0;
  28 -}
  29 -#endif
  30 +#define XIO_PACKED(x)  (((x) & XIO_PORT_BITS) != 0)
  31 +#define XIO_ADDR(x)    ((x) & XIO_ADDR_BITS)
  32 +#define XIO_PORT(x)    ((s8)(((x) & XIO_PORT_BITS) >> XIO_PORT_SHIFT))
  33 +#define XIO_PACK(p, o) ((((u64)(p)) << XIO_PORT_SHIFT) | ((o) & XIO_ADDR_BITS))
  34
  35  #endif /* !__ASSEMBLY__ */
  36