1. 26 3月, 2013 3 次提交
    • M
      drivers: android: binder: Fix code style in binder_deferred_release · 53413e7d
      Mirsal Ennaime 提交于
       * Use tabs where applicable
       * Remove a few "80-columns" checkpatch warnings
       * Separate code paths with empty lines for readability
      Signed-off-by: NMirsal Ennaime <mirsal@mirsal.fr>
      Reviewed-by: NDan Carpenter <dan.carpenter@oracle.com>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      53413e7d
    • M
      drivers: android: binder: Move the node release code to a separate function · 008fa749
      Mirsal Ennaime 提交于
      The binder_deferred_release() function has many levels of indentation
      which makes it difficult to read. This patch moves the code which deals
      with disposing of a binder node to a separate binder_node_release()
      function, thus removing one level of indentation and allowing the code to
      fit in 80 columns.
      Signed-off-by: NMirsal Ennaime <mirsal@mirsal.fr>
      Reviewed-by: NDan Carpenter <dan.carpenter@oracle.com>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      008fa749
    • G
      Merge tag 'iio-for-3.10a' of... · ef994fda
      Greg Kroah-Hartman 提交于
      Merge tag 'iio-for-3.10a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next
      
      Jonathan writes:
      
      First set of IIO new drivers and cleanup for the 3.10 cycle.
      
      New stuff
      
      1) Add OF support for specifying mappings between iio devices and their
         in kernel consumers.
      2) Driver for AD7923 (extra functionality and support for ad7904, ad7914 and
         ad7924 added later in series)
      3) Driver for Exynos adc (dt suppor for phy added later in series).
      4) Make iio_push_event save IRQ context - necessary if it is to be used
         within an interrupt handler.  Users of this functionality to follow.
      5) For iio use the device tree node name to provide the hwmon name attribute
         if available.
      
      Removal and moves out of staging
      
      1) Drop the adt7410 driver from IIO now that there is a hmwon driver with
         equivalent support. This device is very much targeted at hardware
         monitoring so hwmon is a more appropriate host for the driver.
      2) Move iio_hwmon driver to drivers/hwmon.
      
      Cleanups
      
      1) Minor cleanup in ST common library.
      2) Large set of patches to break the info_mask element which previously used
      odd and even bits to specify if a channel attribute was either shared across
      similar channels or specific to only one.  Now we have two bitmaps, one for
      those parameters that are specific to this channel and one for those shared
      by all channels with the same type as this one.  This has no effect on the
      userspace abi. It simplifies the core code and provides more space for new
      channel parameters. It has been on the todo list for a long time!
      
      Conflicts:
      	drivers/iio/dac/ad5064.c
      ef994fda
  2. 23 3月, 2013 1 次提交
    • J
      hwmon: Move the IIO client driver for hwmon out of staging · 51b53dc9
      Jonathan Cameron 提交于
      This driver uses channel maps, defined either through device tree
      or platform data, to create a hwmon driver which acts as a client
      for the underlying IIO device channels.  Thus a general purpose
      IIO adc driver can be used to provide hardware monitoring using a subset
      of its channels.
      Signed-off-by: NJonathan Cameron <jic23@kernel.org>
      Acked-by: NGuenter Roeck <linux@roeck-us.net>
      
      --
       The only non move changes here concern the description and changes to the
       dependencies to IIO explicit and hwmon implicit.
      
       I'm proposing moving this into hwmon on the basis of placing drivers
       based on what they provide rather than what their underlying hardware
       is.
      
       drivers/hwmon/Kconfig           |   9 ++
       drivers/hwmon/Makefile          |   1 +
       drivers/hwmon/iio_hwmon.c       | 196 ++++++++++++++++++++++++++++++++++++++++
       drivers/staging/iio/Kconfig     |   8 --
       drivers/staging/iio/Makefile    |   2 -
       drivers/staging/iio/iio_hwmon.c | 196 ----------------------------------------
       6 files changed, 206 insertions(+), 206 deletions(-)
      51b53dc9
  3. 21 3月, 2013 1 次提交
  4. 19 3月, 2013 35 次提交