Eric Lee / smarc-fsl-linux-kernel

09 Dec, 2009

1 commit

  • adf9904dc   Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k ... Browse Code »

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
    m68k: parport_mfc3 - Not makes it a bool before the comparison.
    m68k: don't export static inline functions
    fbdev: atafb - add palette register check
    m68k: Remove the BKL from sys_execve
    m68k: Cleanup linker scripts using new linker script macros.
    m68k: Make thread_info.h usable from assembly.
    m68knommu: define arch_has_single_step() and friends
    m68k: ptrace fixes
    m68k: use generic code for ptrace requests
    rtc: Add an RTC driver for the Ricoh RP5C01
    rtc: Add an RTC driver for the Oki MSM6242

    Linus Torvalds
     

08 Dec, 2009

1 commit

  • 1557d3300   Merge git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl-2.6 ... Browse Code »

    * git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl-2.6: (43 commits)
    security/tomoyo: Remove now unnecessary handling of security_sysctl.
    security/tomoyo: Add a special case to handle accesses through the internal proc mount.
    sysctl: Drop & in front of every proc_handler.
    sysctl: Remove CTL_NONE and CTL_UNNUMBERED
    sysctl: kill dead ctl_handler definitions.
    sysctl: Remove the last of the generic binary sysctl support
    sysctl net: Remove unused binary sysctl code
    sysctl security/tomoyo: Don't look at ctl_name
    sysctl arm: Remove binary sysctl support
    sysctl x86: Remove dead binary sysctl support
    sysctl sh: Remove dead binary sysctl support
    sysctl powerpc: Remove dead binary sysctl support
    sysctl ia64: Remove dead binary sysctl support
    sysctl s390: Remove dead sysctl binary support
    sysctl frv: Remove dead binary sysctl support
    sysctl mips/lasat: Remove dead binary sysctl support
    sysctl drivers: Remove dead binary sysctl support
    sysctl crypto: Remove dead binary sysctl support
    sysctl security/keys: Remove dead binary sysctl support
    sysctl kernel: Remove binary sysctl logic
    ...

    Linus Torvalds
     

06 Dec, 2009

1 commit

29 Nov, 2009

1 commit

  • 5fa9167a1   pcmcia: rework the irq_req_t typedef ... Browse Code »

    Most of the irq_req_t typedef'd struct can be re-worked quite
    easily:

    (1) IRQInfo2 was unused in any case, so drop it.

    (2) IRQInfo1 was used write-only, so drop it.

    (3) Instance (private data to be passed to the IRQ handler):
    Most PCMCIA drivers using pcmcia_request_irq() to actually
    register an IRQ handler set the "dev_id" to the same pointer
    as the "priv" pointer in struct pcmcia_device. Modify the two
    exceptions (ipwireless, ibmtr_cs) to also work this waym and
    set the IRQ handler's "dev_id" to p_dev->priv unconditionally.

    (4) Handler is to be of type irq_handler_t.

    (5) Handler != NULL already tells whether an IRQ handler is present.
    Therefore, we do not need the IRQ_HANDLER_PRESENT flag in
    irq_req_t.Attributes.

    CC: netdev@vger.kernel.org
    CC: linux-bluetooth@vger.kernel.org
    CC: linux-ide@vger.kernel.org
    CC: linux-wireless@vger.kernel.org
    CC: linux-scsi@vger.kernel.org
    CC: alsa-devel@alsa-project.org
    CC: Jaroslav Kysela
    CC: Jiri Kosina
    CC: Karsten Keil
    for the Bluetooth parts: Acked-by: Marcel Holtmann
    Signed-off-by: Dominik Brodowski

    Dominik Brodowski
     

19 Nov, 2009

1 commit

12 Nov, 2009

1 commit

  • 894d24911   sysctl drivers: Remove dead binary sysctl support ... Browse Code »

    Now that sys_sysctl is a wrapper around /proc/sys all of
    the binary sysctl support elsewhere in the tree is
    dead code.

    Cc: Jens Axboe
    Cc: Corey Minyard
    Cc: Greg Kroah-Hartman
    Cc: Matt Mackall
    Cc: Herbert Xu
    Cc: Neil Brown
    Cc: "James E.J. Bottomley"
    Acked-by: Clemens Ladisch for drivers/char/hpet.c
    Signed-off-by: Eric W. Biederman

    Eric W. Biederman
     

09 Nov, 2009

1 commit

  • 9b44de201   pcmcia: use dynamic debug infrastructure, deprecate CS_CHECK (misc drivers) ... Browse Code »

    Convert PCMCIA drivers to use the dynamic debug infrastructure, instead of
    requiring manual settings of PCMCIA_DEBUG.

    Also, remove all usages of the CS_CHECK macro and replace them with proper
    Linux style calling and return value checking. The extra error reporting may
    be dropped, as the PCMCIA core already complains about any (non-driver-author)
    errors.

    CC: linux-mtd@lists.infradead.org
    CC: linux-usb@vger.kernel.org
    Signed-off-by: Dominik Brodowski

    Dominik Brodowski
     

24 Sep, 2009

1 commit

  • 8d65af789   sysctl: remove "struct file *" argument of ->proc_handler ... Browse Code »

    It's unused.

    It isn't needed -- read or write flag is already passed and sysctl
    shouldn't care about the rest.

    It _was_ used in two places at arch/frv for some reason.

    Signed-off-by: Alexey Dobriyan
    Cc: David Howells
    Cc: "Eric W. Biederman"
    Cc: Al Viro
    Cc: Ralf Baechle
    Cc: Martin Schwidefsky
    Cc: Ingo Molnar
    Cc: "David S. Miller"
    Cc: James Morris
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Alexey Dobriyan
     

01 Jul, 2009

1 commit

  • c4285b47b   parport/serial: add support for NetMos 9901 Multi-IO card ... Browse Code »

    Add support for the PCI-Express NetMos 9901 Multi-IO card.

    0001:06:00.0 Serial controller [0700]: NetMos Technology Device [9710:9901] (prog-if 02 [16550])
    Subsystem: Device [a000:1000]
    Control: I/O+ Mem+ BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- DisINTx-
    Status: Cap+ 66MHz- UDF- FastB2B- ParErr- DEVSEL=fast >TAbort- SERR-
    Kernel driver in use: serial
    Kernel modules: 8250_pci

    0001:06:00.1 Serial controller [0700]: NetMos Technology Device [9710:9901] (prog-if 02 [16550])
    Subsystem: Device [a000:1000]
    Control: I/O+ Mem+ BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- DisINTx-
    Status: Cap+ 66MHz- UDF- FastB2B- ParErr- DEVSEL=fast >TAbort- SERR-
    Kernel driver in use: serial
    Kernel modules: 8250_pci

    0001:06:00.2 Parallel controller [0701]: NetMos Technology Device [9710:9901] (prog-if 03 [IEEE1284])
    Subsystem: Device [a000:2000]
    Control: I/O+ Mem+ BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- DisINTx-
    Status: Cap+ 66MHz- UDF- FastB2B- ParErr- DEVSEL=fast >TAbort- SERR-
    Region 2: Memory at 80101000 (32-bit, non-prefetchable) [size=4K]
    Region 4: Memory at 80100000 (32-bit, non-prefetchable) [size=4K]
    Capabilities:
    Kernel driver in use: parport_pc
    Kernel modules: parport_pc

    [ 16.760181] PCI parallel port detected: 416c:0100, I/O at 0x812010(0x0), IRQ 65
    [ 16.760225] parport0: PC-style at 0x812010, irq 65 [PCSPP,TRISTATE,EPP]
    [ 16.851842] serial 0001:06:00.0: enabling device (0004 -> 0007)
    [ 16.883776] 0001:06:00.0: ttyS0 at I/O 0x812030 (irq = 65) is a ST16650V2
    [ 16.893832] serial 0001:06:00.1: enabling device (0004 -> 0007)
    [ 16.926537] 0001:06:00.1: ttyS1 at I/O 0x812020 (irq = 65) is a ST16650V2

    Signed-off-by: Michael Buesch
    Cc: Alan Cox
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Michael Buesch
     

23 Jun, 2009

2 commits

  • dfa7c4d86   parport_pc: set properly the dma_mask for parport_pc device ... Browse Code »

    parport_pc_probe_port() creates the own 'parport_pc' device if the
    device argument is NULL. Then parport_pc_probe_port() doesn't
    initialize the dma_mask and coherent_dma_mask of the device and calls
    dma_alloc_coherent with it. dma_alloc_coherent fails because
    dma_alloc_coherent() doesn't accept the uninitialized dma_mask:

    http://lkml.org/lkml/2009/6/16/150

    Long ago, X86_32 and X86_64 had the own dma_alloc_coherent
    implementations; X86_32 accepted a device having dma_mask that is not
    initialized however X86_64 didn't. When we merged them, we chose to
    prohibit a device having dma_mask that is not initialized. I think
    that it's good to require drivers to set up dma_mask (and
    coherent_dma_mask) properly if the drivers want DMA.

    Signed-off-by: FUJITA Tomonori
    Reported-by: Malcom Blaney
    Tested-by: Malcom Blaney
    Cc: stable@kernel.org
    Signed-off-by: Alan Cox
    Acked-by: Jeff Garzik
    Signed-off-by: Linus Torvalds

    FUJITA Tomonori
     
  • e2434dc1c   parport_pc: after superio probing restore original register values ... Browse Code »

    CONFIG_PARPORT_PC_SUPERIO probes for various superio chips by writing
    byte sequences to a set of different potential I/O ranges. But the
    probed ranges are not exclusive to parallel ports. Some of our boards
    just happen to have a watchdog in one of them. Took us almost a week
    to figure out why some distros reboot without warning after running
    flawlessly for 3 hours. For exactly 170 = 0xAA minutes, that is ...

    Fixed by restoring original values after probing. Also fixed too small
    request_region() in detect_and_report_it87().

    Signed-off-by: Jens Rottmann
    Signed-off-by: Alan Cox
    Cc:
    Acked-by: Jeff Garzik
    Signed-off-by: Linus Torvalds

    Jens Rottmann
     

16 Jun, 2009

1 commit

  • 61616115d   parport: remove driver_data direct access of struct device ... Browse Code »

    In the near future, the driver core is going to not allow direct access
    to the driver_data pointer in struct device. Instead, the functions
    dev_get_drvdata() and dev_set_drvdata() should be used. These functions
    have been around since the beginning, so are backwards compatible with
    all older kernel versions.

    Cc: linux-kernel@vger.kernel.org
    Signed-off-by: Greg Kroah-Hartman

    Greg Kroah-Hartman
     

11 Jun, 2009

3 commits

  • 181bf1e81   parport_pc: clean up the modified while loops using for ... Browse Code »

    And tidy up a few bits coding style detectors missed

    Signed-off-by: Alan Cox
    Signed-off-by: Linus Torvalds

    Alan Cox
     
  • 3aeda9bc9   parport_pc: Coding style ... Browse Code »

    Michael's patch fixed some of the coding style so the style is now
    inconsistent. Sort the rest out

    Signed-off-by: Alan Cox
    Signed-off-by: Linus Torvalds

    Alan Cox
     
  • 73e0d48b8   parport_pc: Fix subscription bugs ... Browse Code »

    This patch fixes array subscription bugs in the parport_pc driver.

    drivers/parport/parport_pc.c: In function ‘parport_irq_probe’:
    drivers/parport/parport_pc.c:1589: warning: array subscript is above array bounds
    drivers/parport/parport_pc.c: In function ‘parport_pc_probe_port’:
    drivers/parport/parport_pc.c:1579: warning: array subscript is above array bounds

    The patch also fixes a few other array bugs, which the compiler was
    unable to find. Coding style violations are also fixed.

    Signed-off-by: Michael Buesch
    Signed-off-by: Alan Cox
    Signed-off-by: Linus Torvalds

    Michael Buesch
     

03 Jun, 2009

1 commit

  • 05ad709d0   parport: quickfix the proc registration bug ... Browse Code »

    Ideally we should have a directory of drivers and a link to the 'active'
    driver. For now just show the first device which is effectively the existing
    semantics without a warning.

    This is an update on the original buggy patch that I then forgot to
    resubmit. Confusingly it was proposed by Red Hat, written by Etched Pixels
    fixed and submitted by Intel ...

    Resolves-Bug: http://bugzilla.kernel.org/show_bug.cgi?id=9749
    Signed-off-by: Alan Cox
    Signed-off-by: Linus Torvalds

    Alan Cox
     

29 May, 2009

1 commit

  • b5d598b41   parport_gsc: fix printk format error ... Browse Code »

    drivers/parport/parport_gsc.c:356: warning: format '%lx' expects type
    'long unsigned int', but argument 2 has type 'resource_size_t'

    [akpm@linux-foundation.org: fix it to handle u64's]
    Signed-off-by: Alexander Beregalov
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Alexander Beregalov
     

07 Apr, 2009

1 commit

  • 51dcdfec6   parport: Use the PCI IRQ if offered ... Browse Code »

    PCI parallel port devices can IRQ share so we should stop them hogging
    the line and making a mess on modern PC systems. We know the sharing
    side works as the PCMCIA driver has shared the parallel port IRQ for
    some time.

    Signed-off-by: Alan Cox
    Signed-off-by: Linus Torvalds

    Alan Cox
     

03 Apr, 2009

1 commit

  • 50db9d8e4   parport: netmos 9845 & 9855 1P4S fixes ... Browse Code »

    netmos serial/parallel adapters come in different flavour differing only
    by the number of parallel and serial ports, which are encoded in the
    subdevice ID.

    Last fix of Christian Pellegrin for 9855 2P2S broke support for 9855 1P4S,
    and works only by side-effect for the first parallel port of a 2P2S, as
    this first parallel port is found by reading the second addr entry of
    (struct parport_pc_pci) cards[netmos_9855], which is not initialized, and
    hence has value 0, which happens to be the BAR of the first parallel port.

    netmos_9xx5_combo entry in (struct parport_pc_pci) cards[], which is used
    for a 9845 1P4S must also be fixed for the parallel port support when
    there are 4 serial ports because this entry currently gives 2 as BAR index
    for the parallel port. Actually, in this case, BAR 2 is the 3rd serial
    port while the parallel port is at BAR 4.

    I fixed 9845 1P4S and 9855 1P4S support, while preserving 9855 2P2S support,

    - by creating a netmos_9855_2p entry and using it for 9855 boards with 2
    parallel ports : 9855 2P2S and 9855 2P0S boards,

    - and by allowing netmos_parallel_init to change not only the number of
    parallel ports (0 or 1), but making it also change the BAR index of the
    parallel port when the serial ports are before the parallel port.

    PS: the netmos_9855_2p entry in (struct pciserial_board)
    pci_parport_serial_boards[] is needed because netmos_parallel_init has no
    clean way to replace FL_BASE2 by FL_BASE4 in the description of the serial
    ports in function of the number of parallel ports on the card.

    Tested with 9845 1P4S, 9855 1P4S and 9855 2P2S boards.

    Signed-off-by: Philippe De Muyter
    Tested-by: Christian Pellegrin
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Philippe De Muyter
     

23 Feb, 2009

1 commit

  • 3d92e8f3a   m68k: atari - Rename "mfp" to "st_mfp" ... Browse Code »

    http://kisskb.ellerman.id.au/kisskb/buildresult/72115/:
    | net/mac80211/ieee80211_i.h:327: error: syntax error before 'volatile'
    | net/mac80211/ieee80211_i.h:350: error: syntax error before '}' token
    | net/mac80211/ieee80211_i.h:455: error: field 'sta' has incomplete type
    | distcc[19430] ERROR: compile net/mac80211/main.c on sprygo/32 failed

    This is caused by

    | # define mfp ((*(volatile struct MFP*)MFP_BAS))

    in arch/m68k/include/asm/atarihw.h, which conflicts with the new "mfp" enum in
    net/mac80211/ieee80211_i.h.

    Rename "mfp" to "st_mfp", as it's a way too generic name for a global #define.

    Signed-off-by: Geert Uytterhoeven
    Signed-off-by: Linus Torvalds

    Geert Uytterhoeven
     

12 Feb, 2009

1 commit

  • 3abdbf90a   parport: parport_serial, don't bind netmos ibm 0299 ... Browse Code »

    Since netmos 9835 with subids 0x1014(IBM):0x0299 is now bound with
    serial/8250_pci, because it has no parallel ports and subdevice id isn't
    in the expected form, return -ENODEV from probe function.

    This is performed in netmos preinit_hook.

    Signed-off-by: Jiri Slaby
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jiri Slaby
     

07 Jan, 2009

1 commit

  • f59abb161   parport: ieee1284: use del_timer_sync() in parport_wait_event() ... Browse Code »

    Use del_timer_sync() instead of del_timer() to make sure the timer won't
    be running when we return from parport_wait_event(), because this would
    crash due to destruction of timer_list.

    This is untested and just based on a code review. Just think about the
    following sequence of events:

    - add_timer()

    - down_interruptible() is interrupted by a signal.

    - we enter the timer callback handler on another CPU.

    - del_timer(), but the timer callback is still running.

    - eturn from parport_wait_even, which destroys the automatic variable
    "timer" while the callback is running on another CPU.

    [akpm@linux-foundation.org: coding-style fixes]
    Signed-off-by: Michael Buesch
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Michael Buesch
     

02 Dec, 2008

1 commit

  • 36be47d6d   parport_serial: fix array overflow ... Browse Code »

    The netmos_9xx5_combo type assumes that PCI SSID provides always the
    correct value for the number of parallel and serial ports, but there are
    indeed broken devices with wrong numbers, which may result in Oops.

    This patch simply adds the check of the array range.

    Reference: Novell bnc#447067
    https://bugzilla.novell.com/show_bug.cgi?id=447067

    Signed-off-by: Takashi Iwai
    Cc:
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Takashi Iwai
     

19 Nov, 2008

1 commit

31 Oct, 2008

1 commit

24 Oct, 2008

1 commit

18 Oct, 2008

1 commit

17 Oct, 2008

2 commits

14 Oct, 2008

1 commit

  • 2be4ff2f0   Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 ... Browse Code »

    * git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: (49 commits)
    pcmcia: ioctl-internal definitions
    pcmcia: cistpl header cleanup
    pcmcia: remove unused argument to pcmcia_parse_tuple()
    pcmcia: card services header cleanup
    pcmcia: device_id header cleanup
    pcmcia: encapsulate ioaddr_t
    pcmcia: cleanup device driver header file
    pcmcia: cleanup socket services header file
    pcmcia: merge ds_internal.h into cs_internal.h
    pcmcia: cleanup cs_internal.h
    pcmcia: cs_internal.h is internal
    pcmcia: use dev_printk for cs_error()
    pcmcia: remove CS_ error codes alltogether
    pcmcia: deprecate CS_BAD_TUPLE
    pcmcia: deprecate CS_BAD_ARGS
    pcmcia: deprecate CS_BAD_BASE, CS_BAD_IRQ, CS_BAD_OFFSET and CS_BAD_SIZE
    pcmcia: deprecate CS_BAD_ATTRIBUTE, CS_BAD_TYPE and CS_BAD_PAGE
    pcmcia: deprecate CS_NO_MORE_ITEMS
    pcmcia: deprecate CS_IN_USE
    pcmcia: deprecate CS_CONFIGURATION_LOCKED
    ...

    Fix trivial conflict in drivers/pcmcia/ds.c manually

    Linus Torvalds
     

31 Aug, 2008

1 commit

29 Aug, 2008

1 commit

23 Aug, 2008

4 commits

27 Jul, 2008

4 commits