1. 13 1月, 2015 30 次提交
  2. 12 1月, 2015 10 次提交
    • P
      csiostor:fix sparse warnings · 78890ed7
      Praveen Madhavan 提交于
      This patch fixes sparse warning reported by kbuild.
      Apply this on net-next since it depends on previous commit.
      
      drivers/scsi/csiostor/csio_hw.c:259:17: sparse: cast to restricted __le32
      drivers/scsi/csiostor/csio_hw.c:536:31: sparse: incorrect type in assignment
      (different base types)
      drivers/scsi/csiostor/csio_hw.c:536:31:    expected unsigned int [unsigned]
      [usertype] <noident>
      drivers/scsi/csiostor/csio_hw.c:536:31:    got restricted __be32 [usertype]
      <noident>
      >> drivers/scsi/csiostor/csio_hw.c:2012:5: sparse: symbol 'csio_hw_prep_fw' was
      not declared. Should it be static?
      Signed-off-by: NPraveen Madhavan <praveenm@chelsio.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      78890ed7
    • W
      doc: fix the compile fix of txtimestamp.c · d3b4b261
      Willem de Bruijn 提交于
      A fix to ipv6 structure definitions removed the now superfluous
      definition of in6_pktinfo in this file.
      
      But, use of the glibc definition requires defining _GNU_SOURCE
      (see also https://sourceware.org/bugzilla/show_bug.cgi?id=6775).
      
      Before this change, the following would fail for me:
      
        make
        make headers_install
        make M=Documentation/networking/timestamping
      
      with
      
        Documentation/networking/timestamping/txtimestamp.c: In function '__recv_errmsg_cmsg':
        Documentation/networking/timestamping/txtimestamp.c:205:33: error: dereferencing pointer to incomplete type
        Documentation/networking/timestamping/txtimestamp.c:206:23: error: dereferencing pointer to incomplete type
      
      After this patch compilation succeeded.
      
      Fixes: cd91cc5b ("doc: fix the compile error of txtimestamp.c")
      Signed-off-by: NWillem de Bruijn <willemb@google.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      d3b4b261
    • D
      Merge branch 'irda-next' · ef5ba4af
      David S. Miller 提交于
      Chunyan Zhang says:
      
      ====================
      irda: Use ktime_t instead of timeval
      
      This patch-set removed all uses of timeval and used ktime_t instead if
      needed, since 32-bit time types will break in the year 2038.
      
      This patch-set also used the ktime_xxx functions accordingly.
      e.g.
      * Used ktime_get to get the current time instead of do_gettimeofday.
      * And, used ktime_us_delta to get the elapsed time directly.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      ef5ba4af
    • C
      irda: vlsi_ir: Replace timeval with ktime_t · 497ec1f2
      Chunyan Zhang 提交于
      The vlsi ir driver uses 'timeval', which we try to remove in the kernel
      because all 32-bit time types will break in the year 2038.
      
      This patch also changes do_gettimeofday() to ktime_get() accordingly,
      since ktime_get returns a ktime_t, but do_gettimeofday returns a
      struct timeval, and the other reason is that ktime_get() uses
      the monotonic clock.
      
      This patch uses ktime_us_delta to get the elapsed time of microsecond,
      and uses div_s64_rem to get what seconds & microseconds time elapsed
      for printing.
      
      This patch also changes the function 'vlsi_hard_start_xmit' to do the
      same things as the others drivers, that is passing the remaining time
      into udelay() instead of looping until enough time has passed.
      Signed-off-by: NChunyan Zhang <zhang.chunyan@linaro.org>
      Reviewed-by: NArnd Bergmann <arnd@arndb.de>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      497ec1f2
    • C
      irda: stir4200: Replace timeval with ktime_t · 89a07e17
      Chunyan Zhang 提交于
      The stir4200 driver uses 'timeval', which we try to remove in the kernel
      because all 32-bit time types will break in the year 2038.
      
      This patch also changes do_gettimeofday() to ktime_get() accordingly,
      since ktime_get returns a ktime_t, but do_gettimeofday returns a
      struct timeval, and the other reason is that ktime_get() uses
      the monotonic clock.
      
      This patch uses ktime_us_delta to get the elapsed time of microsecond.
      Signed-off-by: NChunyan Zhang <zhang.chunyan@linaro.org>
      Reviewed-by: NArnd Bergmann <arnd@arndb.de>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      89a07e17
    • C
      irda: nsc-ircc: Replace timeval with ktime_t · 4c3bd197
      Chunyan Zhang 提交于
      The nsc ircc driver uses 'timeval', which we try to remove in the kernel
      because all 32-bit time types will break in the year 2038.
      
      This patch also changes do_gettimeofday() to ktime_get() accordingly,
      since ktime_get returns a ktime_t, but do_gettimeofday returns a
      struct timeval, and the other reason is that ktime_get() uses
      the monotonic clock.
      
      This patch uses ktime_us_delta to get the elapsed time, and in this
      way it no longer needs to check for the overflow, because
      ktime_us_delta returns time difference of microsecond.
      Signed-off-by: NChunyan Zhang <zhang.chunyan@linaro.org>
      Reviewed-by: NArnd Bergmann <arnd@arndb.de>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      4c3bd197
    • C
      irda: irda-usb: Replace timeval with ktime_t · ca98278a
      Chunyan Zhang 提交于
      The irda usb driver uses 'timeval', which we try to remove in the kernel
      because all 32-bit time types will break in the year 2038.
      
      This patch also changes do_gettimeofday() to ktime_get() accordingly,
      since ktime_get returns a ktime_t, but do_gettimeofday returns a
      struct timeval, and the other reason is that ktime_get() uses
      the monotonic clock.
      
      This patch uses ktime_us_delta to get the elapsed time, and in this
      way it no longer needs to check for the overflow, because
      ktime_us_delta returns time difference of microsecond.
      Signed-off-by: NChunyan Zhang <zhang.chunyan@linaro.org>
      Reviewed-by: NArnd Bergmann <arnd@arndb.de>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      ca98278a
    • C
      irda: ali-ircc: Replace timeval with ktime_t · 9f61e309
      Chunyan Zhang 提交于
      The ali ircc driver uses 'timeval', which we try to remove in the kernel
      because all 32-bit time types will break in the year 2038.
      
      This patch also changes do_gettimeofday() to ktime_get() accordingly,
      since ktime_get returns a ktime_t, but do_gettimeofday returns a
      struct timeval, and the other reason is that ktime_get() uses
      the monotonic clock.
      
      This patch uses ktime_us_delta to get the elapsed time, and in this
      way it no longer needs to check for the overflow, because
      ktime_us_delta returns time difference of microsecond.
      Signed-off-by: NChunyan Zhang <zhang.chunyan@linaro.org>
      Reviewed-by: NArnd Bergmann <arnd@arndb.de>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      9f61e309
    • C
      irda: Removed all unused timeval variables · 270d73c1
      Chunyan Zhang 提交于
      In the file au1k_ir.c & via-ircc.h, there were two unused definitions of the
      timeval type members, this commit therefore removes this unneeded code.
      
      In other three files, the same problem is the rx_time member is only ever
      written, never read, so removed it entirely.
      Signed-off-by: NChunyan Zhang <zhang.chunyan@linaro.org>
      Reviewed-by: NArnd Bergmann <arnd@arndb.de>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      270d73c1
    • D
      Merge branch 'sti_drivers' · f3cd7a26
      David S. Miller 提交于
      Peter Griffin says:
      
      ====================
      Fix sti drivers whcih mix reg address spaces
      
      A V2 of this old series incorporating Arnd and Lees Feedback form v1.
      
      Following on from Arnds comments about the picophy driver here
      https://lkml.org/lkml/2014/11/13/161, this series fixes the
      remaining upstreamed drivers for STI, which are mixing address spaces
      in the reg property. We do this in a way similar to the keystone
      and bcm7445 platforms, by having sysconfig phandle/ offset pair
      (where only one register is required). Or phandle / integer array
      where multiple offsets in the same bank are needed).
      
      This series breaks DT compatability! But the platform support
      is WIP and only being used by the few developers who are upstreaming
      support for it. I've made each change to the driver / dt doc / dt
      file as a single atomic commit so the kernel will remain bisectable.
      
      This series then also enables the picophy driver, and adds back in
      the ehci/ohci dt nodes for stih410 which make use of the picophy.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      f3cd7a26