summaryrefslogtreecommitdiff
path: root/drivers
AgeCommit message (Collapse)Author
2008-06-17Merge commit 'tests/master'Stephen Rothwell
Conflicts: lib/Kconfig.debug
2008-06-17Merge commit 'scsi/master'Stephen Rothwell
2008-06-17Merge commit 'ubi/master'Stephen Rothwell
2008-06-17Merge commit 'hwmon/testing'Stephen Rothwell
2008-06-17Merge commit 'ieee1394/for-next'Stephen Rothwell
2008-06-17Merge commit 'acpi/test'Stephen Rothwell
Conflicts: drivers/acpi/processor_throttling.c drivers/acpi/sleep/main.c
2008-06-17Merge commit 'infiniband/for-next'Stephen Rothwell
2008-06-17Merge commit 'libata/NEXT'Stephen Rothwell
2008-06-17Merge branch 'quilt/ide'Stephen Rothwell
2008-06-17Merge commit 'sh/master'Stephen Rothwell
2008-06-17Merge commit 's390/features'Stephen Rothwell
Conflicts: drivers/s390/block/dasd.c drivers/s390/block/dasd_eckd.c drivers/s390/block/dasd_fba.c drivers/s390/char/tape_core.c drivers/s390/cio/device_fsm.c drivers/s390/net/claw.c drivers/s390/net/ctcm_main.c drivers/s390/net/lcs.c
2008-06-17Merge commit 'v4l-dvb/stable'Stephen Rothwell
2008-06-17Merge branch 'quilt/i2c'Stephen Rothwell
Conflicts: drivers/i2c/i2c-core.c
2008-06-17Merge commit 'hid/mm'Stephen Rothwell
2008-06-17Merge commit 'pci/linux-next'Stephen Rothwell
Conflicts: include/linux/device.h
2008-06-17Merge commit 'timers/auto-timers-next'Stephen Rothwell
2008-06-17Merge commit 'sched/auto-sched-next'Stephen Rothwell
Conflicts: kernel/Makefile
2008-06-17Merge commit 'cpus4096/auto-cpus4096-next'Stephen Rothwell
2008-06-17Merge commit 'tip-core/auto-core-next'Stephen Rothwell
2008-06-17Merge branch 'quilt/usb'Stephen Rothwell
2008-06-17Merge branch 'quilt/driver-core'Stephen Rothwell
Conflicts: drivers/scsi/hosts.c
2008-06-17Merge commit 'input-current/for-linus'Stephen Rothwell
2008-06-17Merge branch 'quilt/usb.current'Stephen Rothwell
2008-06-17Merge branch 'quilt/driver-core.current'Stephen Rothwell
2008-06-17Merge commit 'net-current/master'Stephen Rothwell
2008-06-17Merge commit 'scsi-rc-fixes/master'Stephen Rothwell
2008-06-17ide-floppy: zero out the whole struct ide_atapi_pc on initBorislav Petkov
This is a precaution just to make sure a new pc is clean when allocated. There should be no functional change introduced by this patch. [bart: ported it over IDE changes] Signed-off-by: Borislav Petkov <petkovbb@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-06-17ide-floppy: fold idefloppy_create_test_unit_ready_cmd into idefloppy_openBorislav Petkov
There's no need for this function since it is used only once. [bart: ported it over IDE changes] Signed-off-by: Borislav Petkov <petkovbb@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-06-17ide-cd: move request prep chunk from cdrom_do_newpc_cont to rq issue pathBorislav Petkov
As a nice side effect, this minimizes the IRQ handler execution time. There should be no functionality change resulting from this patch. [bart: remove extra newlines from ide_cd_do_request()] Signed-off-by: Borislav Petkov <petkovbb@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-06-17ide-cd: move request prep from cdrom_start_rw_cont to rq issue pathBorislav Petkov
... by factoring out the rq preparation code into a separate function called in the request routine. As a nice side effect, this minimizes the IRQ handler execution time. There should be no functionality change resulting from this patch. [bart: s/HWGROUP()/drive->hwif->hwgroup/ and remove extra newline] Signed-off-by: Borislav Petkov <petkovbb@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-06-17ide-cd: move request prep from cdrom_start_seek_continuation to rq issue pathBorislav Petkov
... by factoring out the rq preparation code into a separate function called in the request routine. As a nice side effect, this minimizes the IRQ handler execution time. There should be no functionality change resulting from this patch. [bart: s/HWGROUP()/drive->hwif->hwgroup/ and remove extra newlines] Signed-off-by: Borislav Petkov <petkovbb@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-06-17ide-cd: fold cdrom_start_seek into ide_cd_do_requestBorislav Petkov
Do what the compiler does anyway: inline a function that is used only once. This saves us the overhead of a function call and the function is small enough to be embedded in the callsite anyways. Signed-off-by: Borislav Petkov <petkovbb@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-06-17ide-cd: simplify request issuing pathBorislav Petkov
Call cdrom_start_packet_command() only from the ->do_request() routine. As a nice side effect, this improves code readability a bit. There should be no functionality change resulting from this patch. Signed-off-by: Borislav Petkov <petkovbb@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-06-17ide-cd: mv ide_do_rw_cdrom ide_cd_do_requestBorislav Petkov
There should be no functionality change resulting from this patch. Signed-off-by: Borislav Petkov <petkovbb@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-06-17ide-cd: cdrom_start_seek: remove unused argument blockBorislav Petkov
There should be no functionality change resulting from this patch. Signed-off-by: Borislav Petkov <petkovbb@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-06-17ide-cd: ide_do_rw_cdrom: add the catch-all bad request case to the if-else blockBorislav Petkov
There should be no functionality change resulting from this patch. Signed-off-by: Borislav Petkov <petkovbb@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-06-17ide-cd: remove ide_cd_drain_data and ide_cd_pad_transferBorislav Petkov
Use the generic ide_pad_transfer() helper instead. [bart: fixup ide_cd_drain_data() -> ide_pad_transfer() conversion] Signed-off-by: Borislav Petkov <petkovbb@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-06-17ide-cd: remove wait-for-idle-controller bit in cdrom_start_packet_commandBorislav Petkov
This is done in the request issue path anyway. Signed-off-by: Borislav Petkov <petkovbb@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-06-17sgiioc4: call ide_find_port_slot() laterBartlomiej Zolnierkiewicz
Move ide_find_port_slot() call closer to ide_device_add(). This is basically a preparation for the future changes. Cc: Jeremy Higdon <jeremy@sgi.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-06-17swarm: call ide_find_port_slot() laterBartlomiej Zolnierkiewicz
Move ide_find_port_slot() call closer to ide_device_add(). This is basically a preparation for the future changes. Cc: Maciej W. Rozycki <macro@linux-mips.org> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-06-17icside: always try to probe first interfaceBartlomiej Zolnierkiewicz
Try to probe first interface even if ide_hwifs[]'s slot for the second interface cannot be obtained. While at it: - Add DRV_NAME define and use it for request_dma() instead of hwif->name. Cc: Russell King <rmk@arm.linux.org.uk> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-06-17rapide: fix rapide_probe() return valueBartlomiej Zolnierkiewicz
Return -ENOENT on ide_find_port() failure. While at it: - Cleanup rapide_probe() a bit. Cc: Russell King <rmk@arm.linux.org.uk> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-06-17ide: remove needless includes from setup-pci.cBartlomiej Zolnierkiewicz
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-06-17ide: remove needless includes from ide-taskfile.c (take 2)Bartlomiej Zolnierkiewicz
v2: On Sunday 15 June 2008, Geert Uytterhoeven wrote: > As ide-taskfile.c uses scatterlists, it should include <linux/scatterlist.h>. (v1 broke IDE build on m68k, thanks to Geert for finding the bug) Cc: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-06-17ide: remove needless includes from ide.cBartlomiej Zolnierkiewicz
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-06-17ide: remove superfluous BUG_ON() from set_geometry_intr()Bartlomiej Zolnierkiewicz
ide_set_handler() bugs on ->handler == NULL so no need to do it in set_geometry_intr(). There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-06-17ide: allow any command requesting DMA data phase for HDIO_DRIVE_TASKFILEBartlomiej Zolnierkiewicz
Allow any command requesting DMA data phase for HDIO_DRIVE_TASKFILE ioctl and remove no longer needed task_dma_ok() Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-06-17ide-pnp: print driver banner message earlyBartlomiej Zolnierkiewicz
Print driver banner message early and without interface number. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-06-17ide-h8300: print driver banner message earlyBartlomiej Zolnierkiewicz
Print driver banner message early and without interface number. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-06-17ide: print message on error in ide_find_port_slot()Bartlomiej Zolnierkiewicz
* Add DRV_NAME define to ide-h8300.c. * Fix ide-h8300.c, swarm.c and sgiioc4.c to set .name field in struct ide_port_info to DRV_NAME, then convert these host drivers to use ide_find_port_slot() instead of ide_find_port(). * Print message on error in ide_find_port_slot(). Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-14 15:50:43 +0000