1. 13 1月, 2012 4 次提交
    • A
      i2c: Convert to DEFINE_PCI_DEVICE_TABLE · 3527bd50
      Axel Lin 提交于
      Convert static struct pci_device_id *[] to static DEFINE_PCI_DEVICE_TABLE
      tables.
      
      Use DEFINE_PCI_DEVICE_TABLE ensures we make the pci_device_id table const
      and marked as __devinitconst.
      
      This also fixes some warnings from checkpatch:
      e.g.
      WARNING: Use DEFINE_PCI_DEVICE_TABLE for struct pci_device_id
      #1096: FILE: i2c/busses/i2c-intel-mid.c:1096:
      +static struct pci_device_id intel_mid_i2c_ids[] = {
      Signed-off-by: NAxel Lin <axel.lin@gmail.com>
      Cc: Rudolf Marek <r.marek@assembler.cz>
      Cc: Ben Dooks <ben-linux@fluff.org>
      Acked-by: NOlof Johansson <olof@lixom.net>
      Cc: "Mark M. Hoffman" <mhoffman@lightlink.com>
      Acked-by: NDirk Brandewie <dirk.brandewie@gmail.com>
      Cc: Tomoya MORINAGA <tomoya-linux@dsn.lapis-semi.com>
      Acked-by: NWolfram Sang <w.sang@pengutronix.de>
      Cc: Feng Tang <feng.tang@intel.com>
      Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
      Signed-off-by: NJean Delvare <khali@linux-fr.org>
      3527bd50
    • C
      i2c-ali1535: enable SPARC support · 65a2d74b
      corentin.labbe 提交于
      The i2c-ali1535 driver doesn't work on SPARC, because it assumes that
      ioport address are 16-bit wide (address stored in an unsigned short).
      But on SPARC arch, ioports are mapped in memory and so must be stored
      in an unsigned long.
      
      Use pci_resource_start for getting IOMEM base address, then read the
      SMBBA of the i2c bus and use these together for I/O access.
      
      I would like to thank Jean DELVARE for reviewing my patch.
      Signed-off-by: NLABBE Corentin <corentin.labbe@geomatys.fr>
      Signed-off-by: NJean Delvare <khali@linux-fr.org>
      65a2d74b
    • J
      i2c: Fix error value returned by several bus drivers · 7c1f59c9
      Jean Delvare 提交于
      When adding checks for ACPI resource conflicts to many bus drivers,
      not enough attention was paid to the error paths, and for several
      drivers this causes 0 to be returned on error in some cases. Fix this
      by properly returning a non-zero value on every error.
      Signed-off-by: NJean Delvare <khali@linux-fr.org>
      Cc: stable@kernel.org
      7c1f59c9
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · a429638c
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (526 commits)
        ASoC: twl6040 - Add method to query optimum PDM_DL1 gain
        ALSA: hda - Fix the lost power-setup of seconary pins after PM resume
        ALSA: usb-audio: add Yamaha MOX6/MOX8 support
        ALSA: virtuoso: add S/PDIF input support for all Xonars
        ALSA: ice1724 - Support for ooAoo SQ210a
        ALSA: ice1724 - Allow card info based on model only
        ALSA: ice1724 - Create capture pcm only for ADC-enabled configurations
        ALSA: hdspm - Provide unique driver id based on card serial
        ASoC: Dynamically allocate the rtd device for a non-empty release()
        ASoC: Fix recursive dependency due to select ATMEL_SSC in SND_ATMEL_SOC_SSC
        ALSA: hda - Fix the detection of "Loopback Mixing" control for VIA codecs
        ALSA: hda - Return the error from get_wcaps_type() for invalid NIDs
        ALSA: hda - Use auto-parser for HP laptops with cx20459 codec
        ALSA: asihpi - Fix potential Oops in snd_asihpi_cmode_info()
        ALSA: hdsp - Fix potential Oops in snd_hdsp_info_pref_sync_ref()
        ALSA: hda/cirrus - support for iMac12,2 model
        ASoC: cx20442: add bias control over a platform provided regulator
        ALSA: usb-audio - Avoid flood of frame-active debug messages
        ALSA: snd-usb-us122l: Delete calls to preempt_disable
        mfd: Put WM8994 into cache only mode when suspending
        ...
      
      Fix up trivial conflicts in:
       - arch/arm/mach-s3c64xx/mach-crag6410.c:
      	renamed speyside_wm8962 to tobermory, added littlemill right
      	next to it
       - drivers/base/regmap/{regcache.c,regmap.c}:
      	duplicate diff that had already come in with other changes in
      	the regmap tree
      a429638c
  2. 12 1月, 2012 31 次提交
  3. 11 1月, 2012 5 次提交