07 Nov, 2011

3 commits

  • * '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
     
  • Commit 2265cef2 (hwmon: (w83627ehf) Properly report PECI and AMD-SI
    sensor types) results in kernel panic if data->temp_label was not
    initialized.
    The problem was found with chip W83627DHG-P.

    Add check if data->temp->label was set before use.

    Based on incomplete patch by Alexander Beregalov.

    Reported-by: Alexander Beregalov
    Tested-by: Alexander Beregalov
    Cc: stable@kernel.org
    Signed-off-by: Guenter Roeck
    Signed-off-by: Jean Delvare

    Guenter Roeck
     
  • The definition of TO_ATTR_NO in the non-SMP case is wrong. As the SMP
    definition resolves to the correct value, just use this for both
    cases.

    Without this fix the temperature attributes are named temp0_* instead
    of temp2_*, so libsensors won't pick them. Broken since kernel 3.0.

    Signed-off-by: Jean Delvare
    Tested-by: Phil Sutter
    Cc: stable@kernel.org
    Acked-by: Durgadoss R
    Acked-by: Guenter Roeck

    Jean Delvare
     

04 Nov, 2011

13 commits

  • This is essentially a stripped down version of the W83627DHG. Noticeable
    difference is that it is still powered with +5V, as older models, even
    though the ADC resolution is 8 mV as newer models have.

    Thanks to Ulf Bruman (Saab Group) for doing all the testing.

    Signed-off-by: Jean Delvare
    Acked-by: Guenter Roeck

    Jean Delvare
     
  • The probe function has grown pretty large, I think it's time for some
    cleanups, starting with these two simple ones:
    * Move temp3/in6 check for the W83667HG later in the function, where
    it is done for all other chip types.
    * Move temperature register setting to a separate function, to avoid
    code duplication.

    Signed-off-by: Jean Delvare
    Acked-by: Guenter Roeck

    Jean Delvare
     
  • When temperature sources are PECI or AMD-SI agents, it makes no sense
    to report their type as diode or thermistor. Instead we must report
    their digital nature.

    Signed-off-by: Jean Delvare
    Cc: stable@kernel.org
    Acked-by: Guenter Roeck

    Jean Delvare
     
  • Make use of the new i2c_smbus_{read,write}_word_swapped functions.
    This makes the driver code more compact and readable. It also ensures
    proper error handling.

    Signed-off-by: Jean Delvare
    Acked-by: Jonathan Cameron
    Acked-by: Guenter Roeck
    Cc: Dirk Eibach
    Cc: "Mark M. Hoffman"
    Cc: Guillaume Ligneul

    Jean Delvare
     
  • Signed-off-by: Jean Delvare
    Acked-by: Guenter Roeck

    Jean Delvare
     
  • Clean up the code to make it more readable:
    * Remove reg_ and new_ prefixes from variable names, they made the
    names longer, causing extra line breaks, while not adding much
    value.
    * Introduce struct device dev* = &client->dev in two functions, to
    avoid repeating client->dev everywhere in these functions.

    Signed-off-by: Jean Delvare
    Acked-by: Guenter Roeck

    Jean Delvare
     
  • With some configuration option combinations, we get the following
    warnings:

    drivers/hwmon/lm90.c: In function 'lm90_detect':
    drivers/hwmon/lm90.c:1114: warning: 'chip_id' may be used uninitialized
    in this function
    drivers/hwmon/lm90.c:1114: warning: 'reg_config1' may be used
    uninitialized in this function
    drivers/hwmon/lm90.c:1114: warning: 'reg_convrate' may be used
    uninitialized in this function
    drivers/hwmon/lm90.c:1187: warning: 'reg_emerg2' may be used
    uninitialized in this function
    drivers/hwmon/lm90.c:1187: warning: 'reg_status2' may be used
    uninitialized in this function

    We can solve these easily by reading the register values first and
    checking for errors later. These errors should be very rare, even in
    the case of failed detection, so this change has no impact on
    performance. And this makes checkpatch.pl happier.

    Reported-by: Guenter Roeck
    Signed-off-by: Jean Delvare
    Acked-by: Guenter Roeck

    Jean Delvare
     
  • Preallocate a buffer for the response to sensor reads, and reuse it
    for each read instead of allocating a new one each time. This should
    be faster and should also avoid memory fragmentation.

    Signed-off-by: Jean Delvare
    Acked-by: Darrick J. Wong
    Acked-by: Guenter Roeck

    Jean Delvare
     
  • There is no good reason that I can see why the failure to initialize
    one instance should prevent other instances from being initialized.

    Signed-off-by: Jean Delvare
    Acked-by: Darrick J. Wong
    Acked-by: Guenter Roeck

    Jean Delvare
     
  • I am under the impression that error paths in functions
    aem_init_aem1_inst() and aem_init_aem2_inst() are incorrect. In
    several cases, the function returns 0 on error, which I suspect is
    not intended. Fix this by properly tracking error codes.

    Signed-off-by: Jean Delvare
    Acked-by: Darrick J. Wong
    Acked-by: Guenter Roeck

    Jean Delvare
     
  • Word reads can cause trouble with some I2C devices, so do as much
    detection as we can using only byte reads, and only use a word read in
    the end to confirm the positive match. Also properly handle read
    errors.

    Signed-off-by: Jean Delvare
    Acked-by: Guenter Roeck
    Cc: Robert Casanova

    Jean Delvare
     
  • A modprobe of hwmon drivers that read/write ISA addresses on a powerpc results
    in a kernel Oops. These reads/writes are being done via the inb()/in_8() and
    outb()/out_8() macros.

    Prevent these drivers from being built for powerpc.

    Signed-off-by: Dean Nelson
    Signed-off-by: Jean Delvare

    Dean Nelson
     
  • * '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

3 commits


28 Oct, 2011

1 commit

  • * 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    x86, microcode, AMD: Add microcode revision to /proc/cpuinfo
    x86, microcode: Correct microcode revision format
    coretemp: Get microcode revision from cpu_data
    x86, intel: Use c->microcode for Atom errata check
    x86, intel: Output microcode revision in /proc/cpuinfo
    x86, microcode: Don't request microcode from userspace unnecessarily

    Fix up trivial conflicts in arch/x86/kernel/cpu/amd.c (conflict between
    moving AMD BSP code to cpu_dev helper function and adding AMD microcode
    revision to /proc/cpuinfo code)

    Linus Torvalds
     

25 Oct, 2011

20 commits