15 Jan, 2012

1 commit

  • Autogenerated GPG tag for Rusty D1ADB8F1: 15EE 8D6C AB0E 7F0C F999 BFCB D920 0E6C D1AD B8F1

    * tag 'for-linus' of git://github.com/rustyrussell/linux:
    module_param: check that bool parameters really are bool.
    intelfbdrv.c: bailearly is an int module_param
    paride/pcd: fix bool verbose module parameter.
    module_param: make bool parameters really bool (drivers & misc)
    module_param: make bool parameters really bool (arch)
    module_param: make bool parameters really bool (core code)
    kernel/async: remove redundant declaration.
    printk: fix unnecessary module_param_name.
    lirc_parallel: fix module parameter description.
    module_param: avoid bool abuse, add bint for special cases.
    module_param: check type correctness for module_param_array
    modpost: use linker section to generate table.
    modpost: use a table rather than a giant if/else statement.
    modules: sysfs - export: taint, coresize, initsize
    kernel/params: replace DEBUGP with pr_debug
    module: replace DEBUGP with pr_debug
    module: struct module_ref should contains long fields
    module: Fix performance regression on modules with large symbol tables
    module: Add comments describing how the "strmap" logic works

    Fix up conflicts in scripts/mod/file2alias.c due to the new linker-
    generated table approach to adding __mod_*_device_table entries. The
    ARM sa11x0 mcp bus needed to be converted to that too.

    Linus Torvalds
     

14 Jan, 2012

1 commit

  • * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (59 commits)
    rtc: max8925: Add function to work as wakeup source
    mfd: Add pm ops to max8925
    mfd: Convert aat2870 to dev_pm_ops
    mfd: Still check other interrupts if we get a wm831x touchscreen IRQ
    mfd: Introduce missing kfree in 88pm860x probe routine
    mfd: Add S5M series configuration
    mfd: Add s5m series irq driver
    mfd: Add S5M core driver
    mfd: Improve mc13xxx dt binding document
    mfd: Fix stmpe section mismatch
    mfd: Fix stmpe build warning
    mfd: Fix STMPE I2c build failure
    mfd: Constify aat2870-core i2c_device_id table
    gpio: Add support for stmpe variant 801
    mfd: Add support for stmpe variant 801
    mfd: Add support for stmpe variant 610
    mfd: Add support for STMPE SPI interface
    mfd: Separate out STMPE controller and interface specific code
    misc: Remove max8997-muic sysfs attributes
    mfd: Remove unused wm831x_irq_data_to_mask_reg()
    ...

    Fix up trivial conflict in drivers/leds/Kconfig due to addition of
    LEDS_MAX8997 and LEDS_TCA6507 next to each other.

    Linus Torvalds
     

13 Jan, 2012

2 commits


11 Jan, 2012

3 commits

  • Recent conversion to module_platform_driver() went a bit too far and
    converted not only drivers that used platform_driver_register() but
    also ones using platform_driver_probe(), breaking them in process.

    Reported-by: Geert Uytterhoeven
    Signed-off-by: Dmitry Torokhov

    Dmitry Torokhov
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (64 commits)
    Input: tc3589x-keypad - add missing kerneldoc
    Input: ucb1400-ts - switch to using dev_xxx() for diagnostic messages
    Input: ucb1400_ts - convert to threaded IRQ
    Input: ucb1400_ts - drop inline annotations
    Input: usb1400_ts - add __devinit/__devexit section annotations
    Input: ucb1400_ts - set driver owner
    Input: ucb1400_ts - convert to use dev_pm_ops
    Input: psmouse - make sure we do not use stale methods
    Input: evdev - do not block waiting for an event if fd is nonblock
    Input: evdev - if no events and non-block, return EAGAIN not 0
    Input: evdev - only allow reading events if a full packet is present
    Input: add driver for pixcir i2c touchscreens
    Input: samsung-keypad - implement runtime power management support
    Input: tegra-kbc - report wakeup key for some platforms
    Input: tegra-kbc - add device tree bindings
    Input: add driver for AUO In-Cell touchscreens using pixcir ICs
    Input: mpu3050 - configure the sampling method
    Input: mpu3050 - ensure we enable interrupts
    Input: mpu3050 - add of_match table for device-tree probing
    Input: sentelic - document the latest hardware
    ...

    Fix up fairly trivial conflicts (device tree matching conflicting with
    some independent cleanups) in drivers/input/keyboard/samsung-keypad.c

    Linus Torvalds
     
  • * 'stable/for-linus-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: (37 commits)
    xen/pciback: Expand the warning message to include domain id.
    xen/pciback: Fix "device has been assigned to X domain!" warning
    xen/pciback: Move the PCI_DEV_FLAGS_ASSIGNED ops to the "[un|]bind"
    xen/xenbus: don't reimplement kvasprintf via a fixed size buffer
    xenbus: maximum buffer size is XENSTORE_PAYLOAD_MAX
    xen/xenbus: Reject replies with payload > XENSTORE_PAYLOAD_MAX.
    Xen: consolidate and simplify struct xenbus_driver instantiation
    xen-gntalloc: introduce missing kfree
    xen/xenbus: Fix compile error - missing header for xen_initial_domain()
    xen/netback: Enable netback on HVM guests
    xen/grant-table: Support mappings required by blkback
    xenbus: Use grant-table wrapper functions
    xenbus: Support HVM backends
    xen/xenbus-frontend: Fix compile error with randconfig
    xen/xenbus-frontend: Make error message more clear
    xen/privcmd: Remove unused support for arch specific privcmp mmap
    xen: Add xenbus_backend device
    xen: Add xenbus device driver
    xen: Add privcmd device driver
    xen/gntalloc: fix reference counts on multi-page mappings
    ...

    Linus Torvalds
     

09 Jan, 2012

2 commits


07 Jan, 2012

1 commit

  • This resolves the conflict in the arch/arm/mach-s3c64xx/s3c6400.c file,
    and it fixes the build error in the arch/x86/kernel/microcode_core.c
    file, that the merge did not catch.

    The microcode_core.c patch was provided by Stephen Rothwell
    who was invaluable in the merge issues involved
    with the large sysdev removal process in the driver-core tree.

    Signed-off-by: Greg Kroah-Hartman

    Greg Kroah-Hartman
     

05 Jan, 2012

1 commit

  • The 'name', 'owner', and 'mod_name' members are redundant with the
    identically named fields in the 'driver' sub-structure. Rather than
    switching each instance to specify these fields explicitly, introduce
    a macro to simplify this.

    Eliminate further redundancy by allowing the drvname argument to
    DEFINE_XENBUS_DRIVER() to be blank (in which case the first entry from
    the ID table will be used for .driver.name).

    Also eliminate the questionable xenbus_register_{back,front}end()
    wrappers - their sole remaining purpose was the checking of the
    'owner' field, proper setting of which shouldn't be an issue anymore
    when the macro gets used.

    v2: Restore DRV_NAME for the driver name in xen-pciback.

    Signed-off-by: Jan Beulich
    Cc: Jens Axboe
    Cc: Dmitry Torokhov
    Cc: Florian Tobias Schandinat
    Cc: Ian Campbell
    Cc: David S. Miller
    Signed-off-by: Konrad Rzeszutek Wilk

    Jan Beulich
     

24 Dec, 2011

3 commits


20 Dec, 2011

1 commit


12 Dec, 2011

3 commits


01 Dec, 2011

2 commits

  • Commit 940ab88962bc1aff3273a8356d64577a6e386736 introduced a new macro to
    save some platform_driver boilerplate code. Use it.

    Signed-off-by: JJ Ding
    Signed-off-by: Dmitry Torokhov

    JJ Ding
     
  • There exist tilt switches that simply report their tilt-state via
    some gpios. The number and orientation of their axes can vary
    depending on the switch used and the build of the device. Also two
    or more one-axis switches could be combined to provide multi-dimensional
    orientation.

    One example of a device using such a switch is the family of Qisda
    ebook readers, where the switch provides information about the
    landscape / portrait orientation of the device. The example in
    Documentation/input/gpio-tilt.txt documents exactly this one-axis
    device.

    Signed-off-by: Heiko Stuebner
    Signed-off-by: Dmitry Torokhov

    Heiko Stübner
     

29 Nov, 2011

2 commits


19 Nov, 2011

1 commit

  • This converts the drivers in drivers/input/* to use the
    module_usb_driver() macro which makes the code smaller and a bit
    simpler.

    Added bonus is that it removes some unneeded kernel log messages about
    drivers loading and/or unloading.

    Cc: Dmitry Torokhov
    Cc: Ville Syrjala
    Cc: Henk Vergonet
    Cc: Alessandro Rubini
    Cc: Henrik Rydberg
    Cc: "Magnus Hörlin"
    Cc: Chris Moeller
    Cc: Christoph Fritz
    Cc: Lucas De Marchi
    Cc: Jesper Juhl
    Cc: Edwin van Vliet
    Cc: Ping Cheng
    Cc: Eduard Hasenleithner
    Cc: Alexander Strakh
    Cc: Glenn Sommer
    Signed-off-by: Greg Kroah-Hartman

    Greg Kroah-Hartman
     

10 Nov, 2011

1 commit

  • With commit 67d0a0754455f89ef3946946159d8ec9e45ce33a we mark strict_strtox
    as obsolete. Convert all remaining such uses in drivers/input/.

    Also change long to appropriate types, and return error conditions
    from kstrtox separately, as Dmitry sugguests.

    Signed-off-by: JJ Ding
    Signed-off-by: Dmitry Torokhov

    JJ Ding
     

07 Nov, 2011

1 commit

  • * 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)
    Revert "tracing: Include module.h in define_trace.h"
    irq: don't put module.h into irq.h for tracking irqgen modules.
    bluetooth: macroize two small inlines to avoid module.h
    ip_vs.h: fix implicit use of module_get/module_put from module.h
    nf_conntrack.h: fix up fallout from implicit moduleparam.h presence
    include: replace linux/module.h with "struct module" wherever possible
    include: convert various register fcns to macros to avoid include chaining
    crypto.h: remove unused crypto_tfm_alg_modname() inline
    uwb.h: fix implicit use of asm/page.h for PAGE_SIZE
    pm_runtime.h: explicitly requires notifier.h
    linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h
    miscdevice.h: fix up implicit use of lists and types
    stop_machine.h: fix implicit use of smp.h for smp_processor_id
    of: fix implicit use of errno.h in include/linux/of.h
    of_platform.h: delete needless include
    acpi: remove module.h include from platform/aclinux.h
    miscdevice.h: delete unnecessary inclusion of module.h
    device_cgroup.h: delete needless include
    net: sch_generic remove redundant use of
    net: inet_timewait_sock doesnt need
    ...

    Fix up trivial conflicts (other header files, and removal of the ab3550 mfd driver) in
    - drivers/media/dvb/frontends/dibx000_common.c
    - drivers/media/video/{mt9m111.c,ov6650.c}
    - drivers/mfd/ab3550-core.c
    - include/linux/dmaengine.h

    Linus Torvalds
     

04 Nov, 2011

1 commit

  • * 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6: (80 commits)
    mfd: Fix missing abx500 header file updates
    mfd: Add missing include to intel_msic
    x86, mrst: add platform support for MSIC MFD driver
    mfd: Expose TurnOnStatus in ab8500 sysfs
    mfd: Remove support for early drop ab8500 chip
    mfd: Add support for ab8500 v3.3
    mfd: Add ab8500 interrupt disable hook
    mfd: Convert db8500-prcmu panic() into pr_crit()
    mfd: Refactor db8500-prcmu request_clock() function
    mfd: Rename db8500-prcmu init function
    mfd: Fix db5500-prcmu defines
    mfd: db8500-prcmu voltage domain consumers additions
    mfd: db8500-prcmu reset code retrieval
    mfd: db8500-prcmu tweak for modem wakeup
    mfd: Add db8500-pcmu watchdog accessor functions for watchdog
    mfd: hwacc power state db8500-prcmu accessor
    mfd: Add db8500-prcmu accessors for PLL and SGA clock
    mfd: Move to the new db500 PRCMU API
    mfd: Create a common interface for dbx500 PRCMU drivers
    mfd: Initialize DB8500 PRCMU regs
    ...

    Fix up trivial conflicts in
    arch/arm/mach-imx/mach-mx31moboard.c
    arch/arm/mach-omap2/board-omap3beagle.c
    arch/arm/mach-u300/include/mach/irqs.h
    drivers/mfd/wm831x-spi.c

    Linus Torvalds
     

01 Nov, 2011

2 commits

  • A pending cleanup will mean that module.h won't be implicitly
    everywhere anymore. Make sure the modular drivers in input dir
    are actually calling out for explicitly in advance.

    Signed-off-by: Paul Gortmaker

    Paul Gortmaker
     
  • * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (348 commits)
    [media] pctv452e: Remove bogus code
    [media] adv7175: Make use of media bus pixel codes
    [media] media: vb2: fix incorrect return value
    [media] em28xx: implement VIDIOC_ENUM_FRAMESIZES
    [media] cx23885: Stop the risc video fifo before reconfiguring it
    [media] cx23885: Avoid incorrect error handling and reporting
    [media] cx23885: Avoid stopping the risc engine during buffer timeout
    [media] cx23885: Removed a spurious function cx23885_set_scale()
    [media] cx23885: v4l2 api compliance, set the audioset field correctly
    [media] cx23885: hook the audio selection functions into the main driver
    [media] cx23885: add generic functions for dealing with audio input selection
    [media] cx23885: fixes related to maximum number of inputs and range checking
    [media] cx23885: Initial support for the MPX-885 mini-card
    [media] cx25840: Ensure AUDIO6 and AUDIO7 trigger line-in baseband use
    [media] cx23885: Enable audio line in support from the back panel
    [media] cx23885: Allow the audio mux config to be specified on a per input basis
    [media] cx25840: Enable support for non-tuner LR1/LR2 audio inputs
    [media] cx23885: Name an internal i2c part and declare a bitfield by name
    [media] cx23885: Ensure VBI buffers timeout quickly - bugfix for vbi hangs during streaming
    [media] cx23885: remove channel dump diagnostics when a vbi buffer times out
    ...

    Fix up trivial conflicts in drivers/misc/altera-stapl/altera.c (header
    file rename vs add)

    Linus Torvalds
     

29 Oct, 2011

1 commit

  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (549 commits)
    ALSA: hda - Fix ADC input-amp handling for Cx20549 codec
    ALSA: hda - Keep EAPD turned on for old Conexant chips
    ALSA: hda/realtek - Fix missing volume controls with ALC260
    ASoC: wm8940: Properly set codec->dapm.bias_level
    ALSA: hda - Fix pin-config for ASUS W90V
    ALSA: hda - Fix surround/CLFE headphone and speaker pins order
    ALSA: hda - Fix typo
    ALSA: Update the sound git tree URL
    ALSA: HDA: Add new revision for ALC662
    ASoC: max98095: Convert codec->hw_write to snd_soc_write
    ASoC: keep pointer to resource so it can be freed
    ASoC: sgtl5000: Fix wrong mask in some snd_soc_update_bits calls
    ASoC: wm8996: Fix wrong mask for setting WM8996_AIF_CLOCKING_2
    ASoC: da7210: Add support for line out and DAC
    ASoC: da7210: Add support for DAPM
    ALSA: hda/realtek - Fix DAC assignments of multiple speakers
    ASoC: Use SGTL5000_LINREG_VDDD_MASK instead of hardcoded mask value
    ASoC: Set sgtl5000->ldo in ldo_regulator_register
    ASoC: wm8996: Use SND_SOC_DAPM_AIF_OUT for AIF2 Capture
    ASoC: wm8994: Use SND_SOC_DAPM_AIF_OUT for AIF3 Capture
    ...

    Linus Torvalds
     

27 Oct, 2011

2 commits

  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (68 commits)
    Input: adp5589-keys - add support for the ADP5585 derivatives
    Input: imx_keypad - add pm suspend and resume support
    Input: force feedback - potential integer wrap in input_ff_create()
    Input: tsc2007 - make sure that X plate resistance is specified
    Input: serio_raw - fix memory leak when closing char device
    Input: serio_raw - kick clients when disconnecting port
    Input: serio_raw - explicitly mark disconnected ports as dead
    Input: serio_raw - fix coding style issues
    Input: serio_raw - use dev_*() for messages
    Input: serio_raw - use bool for boolean data
    Input: serio_raw - perform proper locking when adding clients to list
    Input: serio_raw - rename serio_raw_list to serio_raw_client
    Input: serio_raw - use kref instead of rolling out its own refcounting
    Input: psmouse - switch to using dev_*() for messages
    Input: wacom - correct max Y value on medium bamboos
    Input: wacom - add ABS_DISTANCE to Bamboo Pen reports
    Input: wacom - remove unneeded touch pressure initialization
    Input: lm8323 - wrap suspend and resume in CONFIG_PM_SLEEP
    Input: ad7879-i2c - wrap suspend and resume in CONFIG_PM_SLEEP
    Input: synaptics_i2c - wrap suspend and resume in CONFIG_PM_SLEEP
    ...

    Linus Torvalds
     
  • Dmitry Torokhov
     

25 Oct, 2011

1 commit

  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (59 commits)
    MAINTAINERS: linux-m32r is moderated for non-subscribers
    linux@lists.openrisc.net is moderated for non-subscribers
    Drop default from "DM365 codec select" choice
    parisc: Kconfig: cleanup Kernel page size default
    Kconfig: remove redundant CONFIG_ prefix on two symbols
    cris: remove arch/cris/arch-v32/lib/nand_init.S
    microblaze: add missing CONFIG_ prefixes
    h8300: drop puzzling Kconfig dependencies
    MAINTAINERS: microblaze-uclinux@itee.uq.edu.au is moderated for non-subscribers
    tty: drop superfluous dependency in Kconfig
    ARM: mxc: fix Kconfig typo 'i.MX51'
    Fix file references in Kconfig files
    aic7xxx: fix Kconfig references to READMEs
    Fix file references in drivers/ide/
    thinkpad_acpi: Fix printk typo 'bluestooth'
    bcmring: drop commented out line in Kconfig
    btmrvl_sdio: fix typo 'btmrvl_sdio_sd6888'
    doc: raw1394: Trivial typo fix
    CIFS: Don't free volume_info->UNC until we are entirely done with it.
    treewide: Correct spelling of successfully in comments
    ...

    Linus Torvalds
     

24 Oct, 2011

1 commit


12 Oct, 2011

2 commits


07 Oct, 2011

1 commit


28 Sep, 2011

1 commit

  • There are numerous broken references to Documentation files (in other
    Documentation files, in comments, etc.). These broken references are
    caused by typo's in the references, and by renames or removals of the
    Documentation files. Some broken references are simply odd.

    Fix these broken references, sometimes by dropping the irrelevant text
    they were part of.

    Signed-off-by: Paul Bolle
    Signed-off-by: Jiri Kosina

    Paul Bolle
     

22 Sep, 2011

1 commit


20 Sep, 2011

1 commit


17 Sep, 2011

1 commit

  • * 'for-linus' of git://github.com/dtor/input:
    Input: wacom - fix touch parsing on newer Bamboos
    Input: bcm5974 - add MacBookAir4,1 trackpad support
    Input: wacom - add POINTER and DIRECT device properties
    Input: adp5588-keys - remove incorrect modalias
    Input: cm109 - fix checking return value of usb_control_msg
    Input: wacom - advertise BTN_TOOL_PEN and BTN_STYLUS for PenPartner
    Input: wacom - remove pressure for touch devices

    Linus Torvalds