IDE updates part 3
Subsystems (4)
Part three:
* Resurrect IT8172 IDE host driver.
(from Shane McDonald)
* Fix 32-bit I/O support for ATA-8 and ATA-1 devices. (from Mario Schwalbe)
* Switch ide-cd over generic ATAPI support.
(from Borislav Petkov)
* New locking scheme (which is both simpler and more efficient) for hosts with serialized ports and related cleanups.
* struct ide_dma_ops sanitization and related cleanups. (from Sergei Shtylyov)
* Misc fixups/cleanups...
This should be the final part of IDE updates for 2.6.29 merge window (I would like to thank all contributors!).
Linus, please pull from:
master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6.git/
to receive the following updates:
Documentation/ide/warm-plug-howto.txt | 5 + drivers/ide/Kconfig | 7 + drivers/ide/Makefile | 1 + drivers/ide/aec62xx.c | 4 +- drivers/ide/alim15x3.c | 10 +- drivers/ide/amd74xx.c | 4 +- drivers/ide/au1xxx-ide.c | 11 +- drivers/ide/cmd640.c | 5 +- drivers/ide/cmd64x.c | 23 +- drivers/ide/cs5520.c | 2 +- drivers/ide/cy82c693.c | 2 +- drivers/ide/falconide.c | 1 - drivers/ide/hpt366.c | 23 +- drivers/ide/icside.c | 12 +- drivers/ide/ide-acpi.c | 22 +- drivers/ide/ide-atapi.c | 13 +- drivers/ide/ide-cd.c | 118 +-------- drivers/ide/ide-cd.h | 34 ++-- drivers/ide/ide-disk.c | 4 +- drivers/ide/ide-dma-sff.c | 63 +++-- drivers/ide/ide-dma.c | 2 +- drivers/ide/ide-floppy.c | 2 +- drivers/ide/ide-gd.c | 3 +- drivers/ide/ide-gd.h | 10 +- drivers/ide/ide-h8300.c | 1 - drivers/ide/ide-io.c | 410 ++++++++++++++--------------- drivers/ide/ide-iops.c | 100 +++---- drivers/ide/ide-lib.c | 9 +- drivers/ide/ide-park.c | 16 +- drivers/ide/ide-pm.c | 8 +- drivers/ide/ide-probe.c | 474 +++++++++++++++++---------------- drivers/ide/ide-proc.c | 23 +- drivers/ide/ide-tape.c | 20 +- drivers/ide/ide-taskfile.c | 14 +- drivers/ide/ide.c | 187 +------------- drivers/ide/it8172.c | 166 ++++++++++++ drivers/ide/it8213.c | 4 +- drivers/ide/it821x.c | 13 +- drivers/ide/ns87415.c | 14 +- drivers/ide/palm_bk3710.c | 3 +- drivers/ide/pdc202xx_new.c | 4 +- drivers/ide/pdc202xx_old.c | 14 +- drivers/ide/piix.c | 8 +- drivers/ide/pmac.c | 7 +- drivers/ide/q40ide.c | 1 - drivers/ide/qd65xx.c | 7 +- drivers/ide/qd65xx.h | 4 +- drivers/ide/sc1200.c | 9 +- drivers/ide/scc_pata.c | 33 ++-- drivers/ide/serverworks.c | 2 +- drivers/ide/setup-pci.c | 12 +- drivers/ide/sgiioc4.c | 15 +- drivers/ide/siimage.c | 11 +- drivers/ide/sis5513.c | 2 +- drivers/ide/sl82c105.c | 5 +- drivers/ide/slc90e66.c | 4 +- drivers/ide/tc86c001.c | 17 +- drivers/ide/triflex.c | 2 +- drivers/ide/trm290.c | 10 +- drivers/ide/tx4939ide.c | 23 +- drivers/ide/umc8672.c | 13 +- drivers/ide/via82cxxx.c | 2 +- include/linux/ide.h | 171 +++++-------- include/linux/pci_ids.h | 1 + 64 files changed, 1036 insertions(+), 1184 deletions(-) create mode 100644 drivers/ide/it8172.c
Bartlomiej Zolnierkiewicz (32):
ide: fix LOCKDEP warning
ide: fix setting nIEN on idle devices
ide: add ->cur_port to struct ide_host and use it for serialized hosts
ide: use per-port IRQ handlers
ide: remove hwgroup->hwif and {drive,hwif}->next
ide: use lock bitops for ports serialization (v2)
ide: merge ide_hwgroup_t with ide_hwif_t (v2)
ide: update ide_unregister() documentation
ide: move ide_init_port_data() and friends to ide-probe.c
ide: remove HWIF() macro
ide: remove local_irq_set() macro
ide: remove ide_pci_enablebit_t typedef
ide: remove 'byte' typedef
ide: remove ide_driver_t typedef
ide: unexport ide_wait_not_busy()
ide: remove ->error method from struct ide_driver
amd74xx: use ide_get_pair_dev() helper
cmd640: use ide_get_pair_dev() helper
cmd64x: use ide_get_pair_dev() helper
it821x: use ide_get_pair_dev() helper
ide: NUMA aware allocation of host and port structures
ide: dynamic allocation of device structures
ide: add port and host iterators
ide: make "paranoia" ->handler check in ide_intr() more strict
ide: use ide_pci_is_in_compatibility_mode() helper in setup-pci.c
ide: remove superfluous hwif variable assignment from ide_timer_expiry()
ide: struct ide_atapi_pc - remove unused fields and update documentation
ide: remove unused ide_hwif_t.sg_mapped field
ide: remove now redundant ->cur_dev checks
ide: fix ide_port_scan() to do ACPI setup after initializing request queues
ide: update warm-plug HOWTO
piix: sync ich_laptop[] with ata_piix.c
Borislav Petkov (3):
ide-cd: wait for DRQ to get set per default
ide-cd: start DMA before sending the actual packet command
ide-cd: convert to ide-atapi facilities
Mario Schwalbe (1):
ide: Fix drive's DWORD-IO handling
Sergei Shtylyov (4):
ide: don't set hwif->dma_ops in init_dma() method
ide: move read_sff_dma_status() method to 'struct ide_dma_ops'
ide-dma-sff: factor out ide_dma_sff_write_status()
scc_pata: make use of scc_dma_sff_read_status()
Shane McDonald (1):
Resurrect IT8172 IDE controller driver
Documentation/ide/warm-plug-howto.txt +5 -0
@@ -11,3 +11,8 @@ unplug old device(s) and plug new device(s) # echo -n "1" > /sys/class/ide_port/idex/scan done + +NOTE: please make sure that partitions are unmounted and that there are +no other active references to devices before doing "delete_devices" step, +also do not attempt "scan" step on devices currently in use -- otherwise +results may be unpredictable and lead to data loss if you're unlucky
drivers/ide/Kconfig +7 -0
@@ -511,6 +511,13 @@ config BLK_DEV_PIIX This allows the kernel to change PIO, DMA and UDMA speeds and to configure the chip to optimum performance. +config BLK_DEV_IT8172 + tristate "IT8172 IDE support" + select BLK_DEV_IDEDMA_PCI + help + This driver adds support for the IDE controller on the + IT8172 System Controller. + config BLK_DEV_IT8213 tristate "IT8213 IDE support" select BLK_DEV_IDEDMA_PCI
drivers/ide/Makefile +1 -0
@@ -47,6 +47,7 @@ obj-$(CONFIG_BLK_DEV_SC1200) += sc1200.o obj-$(CONFIG_BLK_DEV_CY82C693) += cy82c693.o obj-$(CONFIG_BLK_DEV_DELKIN) += delkin_cb.o obj-$(CONFIG_BLK_DEV_HPT366) += hpt366.o +obj-$(CONFIG_BLK_DEV_IT8172) += it8172.o obj-$(CONFIG_BLK_DEV_IT8213) += it8213.o obj-$(CONFIG_BLK_DEV_IT821X) += it821x.o obj-$(CONFIG_BLK_DEV_JMICRON) += jmicron.o
drivers/ide/aec62xx.c +2 -2
@@ -83,7 +83,7 @@ static u8 pci_bus_clock_list_ultra (u8 speed, struct chipset_bus_clock_list_entrstatic void aec6210_set_mode (ide_drive_t *drive,const u8 speed) { -ide_hwif_t *hwif =HWIF (drive); +ide_hwif_t *hwif = drive->hwif;struct pci_dev *dev =to_pci_dev (hwif->dev);struct ide_host *host =pci_get_drvdata (dev);struct chipset_bus_clock_list_entry *bus_clock = host->host_priv;
@@ -111,7 +111,7 @@ static void aec6210_set_mode(ide_drive_t *drive, const u8 speed)static void aec6260_set_mode (ide_drive_t *drive,const u8 speed) { -ide_hwif_t *hwif =HWIF (drive); +ide_hwif_t *hwif = drive->hwif;struct pci_dev *dev =to_pci_dev (hwif->dev);struct ide_host *host =pci_get_drvdata (dev);struct chipset_bus_clock_list_entry *bus_clock = host->host_priv;
drivers/ide/alim15x3.c +5 -5
@@ -68,7 +68,7 @@ static struct pci_dev *isa_dev;static void ali_set_pio_mode (ide_drive_t *drive,const u8 pio) { -ide_hwif_t *hwif =HWIF (drive); +ide_hwif_t *hwif = drive->hwif;struct pci_dev *dev =to_pci_dev (hwif->dev);struct ide_timing *t =ide_timing_find_mode (XFER_PIO_0 + pio);int s_time = t->setup, a_time = t->active, c_time = t->cycle;
@@ -150,7 +150,7 @@ static u8 ali_udma_filter(ide_drive_t *drive)static void ali_set_dma_mode (ide_drive_t *drive,const u8 speed) { -ide_hwif_t *hwif =HWIF (drive); +ide_hwif_t *hwif = drive->hwif;struct pci_dev *dev =to_pci_dev (hwif->dev);u8 speed1 = speed;u8 unit = drive->dn &1 ;
@@ -198,7 +198,7 @@ static void ali_set_dma_mode(ide_drive_t *drive, const u8 speed)static int ali15x3_dma_setup (ide_drive_t *drive) {if (m5229_revision <0xC2 && drive->media != ide_disk) { -if (rq_data_dir (drive->hwif->hwgroup->rq)) +if (rq_data_dir (drive->hwif->rq))return 1 ;/* try PIO instead of DMA */ }return ide_dma_setup (drive);
@@ -490,8 +490,6 @@ static int __devinit init_dma_ali15x3(ide_hwif_t *hwif,if (ide_allocate_dma_engine (hwif))return -1 ; - hwif->dma_ops = &sff_dma_ops; -return 0 ; }
@@ -511,6 +509,7 @@ static const struct ide_dma_ops ali_dma_ops = { .dma_test_irq = ide_dma_test_irq, .dma_lost_irq = ide_dma_lost_irq, .dma_timeout = ide_dma_timeout, + .dma_sff_read_status = ide_dma_sff_read_status, };static const struct ide_port_info ali15x3_chipset__devinitdata = {
@@ -519,6 +518,7 @@ static const struct ide_port_info ali15x3_chipset __devinitdata = { .init_hwif = init_hwif_ali15x3, .init_dma = init_dma_ali15x3, .port_ops = &ali_port_ops, + .dma_ops = &sff_dma_ops, .pio_mask = ATA_PIO5, .swdma_mask = ATA_SWDMA2, .mwdma_mask = ATA_MWDMA2,
drivers/ide/amd74xx.c +2 -2
@@ -82,7 +82,7 @@ static void amd_set_drive(ide_drive_t *drive, const u8 speed) {ide_hwif_t *hwif = drive->hwif;struct pci_dev *dev =to_pci_dev (hwif->dev); -ide_drive_t *peer = hwif->drives + (~drive->dn &1 ); +ide_drive_t *peer =ide_get_pair_dev (drive);struct ide_timing t, p;int T ,UT ;u8 udma_mask = hwif->ultra_mask;
@@ -92,7 +92,7 @@ static void amd_set_drive(ide_drive_t *drive, const u8 speed)ide_timing_compute (drive, speed, &t,T ,UT ); -if (peer->dev_flags &IDE_DFLAG_PRESENT ) { +if (peer) {ide_timing_compute (peer, peer->current_speed, &p,T ,UT );ide_timing_merge (&p, &t, &t,IDE_TIMING_8BIT ); }
drivers/ide/au1xxx-ide.c +5 -6
@@ -212,8 +212,8 @@ static void auide_set_dma_mode(ide_drive_t *drive, const u8 speed)static int auide_build_dmatable (ide_drive_t *drive) {int i, iswrite, count =0 ; -ide_hwif_t *hwif =HWIF (drive); -struct request *rq =HWGROUP (drive)->rq; +ide_hwif_t *hwif = drive->hwif; +struct request *rq = hwif->rq;_auide_hwif *ahwif = &auide_hwif;struct scatterlist *sg;
@@ -286,7 +286,7 @@ static int auide_build_dmatable(ide_drive_t *drive)static int auide_dma_end (ide_drive_t *drive) { -ide_hwif_t *hwif =HWIF (drive); +ide_hwif_t *hwif = drive->hwif;if (hwif->sg_nents) {ide_destroy_dmatable (drive);
@@ -309,8 +309,8 @@ static void auide_dma_exec_cmd(ide_drive_t *drive, u8 command) }static int auide_dma_setup (ide_drive_t *drive) -{ -struct request *rq =HWGROUP (drive)->rq; +{ +struct request *rq = drive->hwif->rq;if (!auide_build_dmatable (drive)) {ide_map_sg (drive, rq);
@@ -502,7 +502,6 @@ static const struct ide_tp_ops au1xxx_tp_ops = { .exec_command = ide_exec_command, .read_status = ide_read_status, .read_altstatus = ide_read_altstatus, - .read_sff_dma_status = ide_read_sff_dma_status, .set_irq = ide_set_irq,
drivers/ide/cmd640.c +2 -3
@@ -467,11 +467,10 @@ static void program_drive_counts(ide_drive_t *drive, unsigned int index)* so we merge the timings, using the slowest value for each timing. */ if (index >1 ) { -ide_hwif_t *hwif = drive->hwif; -ide_drive_t *peer = &hwif->drives[!(drive->dn &1 )]; +ide_drive_t *peer =ide_get_pair_dev (drive);unsigned int mate = index ^1 ; -if (peer->dev_flags &IDE_DFLAG_PRESENT ) { +if (peer) {if (setup_count < setup_counts[mate]) setup_count = setup_counts[mate];if (active_count < active_counts[mate])
drivers/ide/cmd64x.c +14 -9
@@ -115,7 +115,7 @@ static void program_cycle_times (ide_drive_t *drive, int cycle_time, int active_*/ static void cmd64x_tune_pio (ide_drive_t *drive,const u8 pio) { -ide_hwif_t *hwif =HWIF (drive); +ide_hwif_t *hwif = drive->hwif;struct pci_dev *dev =to_pci_dev (hwif->dev);struct ide_timing *t =ide_timing_find_mode (XFER_PIO_0 + pio);unsigned int cycle_time;
@@ -138,10 +138,12 @@ static void cmd64x_tune_pio(ide_drive_t *drive, const u8 pio)* the slowest address setup timing ourselves. */ if (hwif->channel) { -ide_drive_t *drives = hwif->drives; +ide_drive_t *pair =ide_get_pair_dev (drive); drive->drive_data = setup_count; - setup_count =max (drives[0 ].drive_data, drives[1 ].drive_data); + +if (pair) + setup_count =max_t (u8, setup_count, pair->drive_data); }if (setup_count >5 )/* shouldn't actually happen... */
@@ -180,7 +182,7 @@ static void cmd64x_set_pio_mode(ide_drive_t *drive, const u8 pio)static void cmd64x_set_dma_mode (ide_drive_t *drive,const u8 speed) { -ide_hwif_t *hwif =HWIF (drive); +ide_hwif_t *hwif = drive->hwif;struct pci_dev *dev =to_pci_dev (hwif->dev);u8 unit = drive->dn &0x01 ;u8 regU =0 , pciU = hwif->channel ?UDIDETCR1 :UDIDETCR0 ;
@@ -226,7 +228,7 @@ static void cmd64x_set_dma_mode(ide_drive_t *drive, const u8 speed)static int cmd648_dma_end (ide_drive_t *drive) { -ide_hwif_t *hwif =HWIF (drive); +ide_hwif_t *hwif = drive->hwif;unsigned long base = hwif->dma_base - (hwif->channel *8 );int err =ide_dma_end (drive); u8 irq_mask = hwif->channel ? MRDMODE_INTR_CH1 :
@@ -242,7 +244,7 @@ static int cmd648_dma_end(ide_drive_t *drive)static int cmd64x_dma_end (ide_drive_t *drive) { -ide_hwif_t *hwif =HWIF (drive); +ide_hwif_t *hwif = drive->hwif;struct pci_dev *dev =to_pci_dev (hwif->dev);int irq_reg = hwif->channel ?ARTTIM23 :CFR ; u8 irq_mask = hwif->channel ? ARTTIM23_INTR_CH1 :
@@ -259,7 +261,7 @@ static int cmd64x_dma_end(ide_drive_t *drive)static int cmd648_dma_test_irq (ide_drive_t *drive) { -ide_hwif_t *hwif =HWIF (drive); +ide_hwif_t *hwif = drive->hwif;unsigned long base = hwif->dma_base - (hwif->channel *8 );u8 irq_mask = hwif->channel ?MRDMODE_INTR_CH1 :MRDMODE_INTR_CH0 ;
@@ -282,7 +284,7 @@ static int cmd648_dma_test_irq(ide_drive_t *drive)static int cmd64x_dma_test_irq (ide_drive_t *drive) { -ide_hwif_t *hwif =HWIF (drive); +ide_hwif_t *hwif = drive->hwif;struct pci_dev *dev =to_pci_dev (hwif->dev);int irq_reg = hwif->channel ?ARTTIM23 :CFR ; u8 irq_mask = hwif->channel ? ARTTIM23_INTR_CH1 :
@@ -313,7 +315,7 @@ static int cmd64x_dma_test_irq(ide_drive_t *drive)static int cmd646_1_dma_end (ide_drive_t *drive) { -ide_hwif_t *hwif =HWIF (drive); +ide_hwif_t *hwif = drive->hwif;u8 dma_stat =0 , dma_cmd =0 ; drive->waiting_for_dma =0 ;
@@ -383,6 +385,7 @@ static const struct ide_dma_ops cmd64x_dma_ops = { .dma_test_irq = cmd64x_dma_test_irq, .dma_lost_irq = ide_dma_lost_irq, .dma_timeout = ide_dma_timeout, + .dma_sff_read_status = ide_dma_sff_read_status, };static const struct ide_dma_ops cmd646_rev1_dma_ops = {
@@ -394,6 +397,7 @@ static const struct ide_dma_ops cmd646_rev1_dma_ops = { .dma_test_irq = ide_dma_test_irq, .dma_lost_irq = ide_dma_lost_irq, .dma_timeout = ide_dma_timeout, + .dma_sff_read_status = ide_dma_sff_read_status, };static const struct ide_dma_ops cmd648_dma_ops = {
@@ -405,6 +409,7 @@ static const struct ide_dma_ops cmd648_dma_ops = { .dma_test_irq = cmd648_dma_test_irq, .dma_lost_irq = ide_dma_lost_irq, .dma_timeout = ide_dma_timeout, + .dma_sff_read_status = ide_dma_sff_read_status, };static const struct ide_port_info cmd64x_chipsets[]__devinitdata = {
drivers/ide/cs5520.c +1 -1
@@ -59,7 +59,7 @@ static struct pio_clocks cs5520_pio_clocks[]={static void cs5520_set_pio_mode (ide_drive_t *drive,const u8 pio) { -ide_hwif_t *hwif =HWIF (drive); +ide_hwif_t *hwif = drive->hwif;struct pci_dev *pdev =to_pci_dev (hwif->dev);int controller = drive->dn >1 ?1 :0 ;
drivers/ide/cy82c693.c +1 -1
@@ -203,7 +203,7 @@ static void cy82c693_set_dma_mode(ide_drive_t *drive, const u8 mode)static void cy82c693_set_pio_mode (ide_drive_t *drive,const u8 pio) { -ide_hwif_t *hwif =HWIF (drive); +ide_hwif_t *hwif = drive->hwif;struct pci_dev *dev =to_pci_dev (hwif->dev);pio_clocks_t pclk;unsigned int addrCtrl;
drivers/ide/falconide.c +0 -1
@@ -70,7 +70,6 @@ static const struct ide_tp_ops falconide_tp_ops = { .exec_command = ide_exec_command, .read_status = ide_read_status, .read_altstatus = ide_read_altstatus, - .read_sff_dma_status = ide_read_sff_dma_status, .set_irq = ide_set_irq,
drivers/ide/hpt366.c +12 -11
@@ -626,7 +626,7 @@ static struct hpt_info *hpt3xx_get_info(struct device *dev)static u8 hpt3xx_udma_filter (ide_drive_t *drive) { -ide_hwif_t *hwif =HWIF (drive); +ide_hwif_t *hwif = drive->hwif;struct hpt_info *info =hpt3xx_get_info (hwif->dev);u8 mask = hwif->ultra_mask;
@@ -665,7 +665,7 @@ static u8 hpt3xx_udma_filter(ide_drive_t *drive)static u8 hpt3xx_mdma_filter (ide_drive_t *drive) { -ide_hwif_t *hwif =HWIF (drive); +ide_hwif_t *hwif = drive->hwif;struct hpt_info *info =hpt3xx_get_info (hwif->dev);switch (info->chip_type) {
@@ -743,7 +743,7 @@ static void hpt3xx_quirkproc(ide_drive_t *drive)static void hpt3xx_maskproc (ide_drive_t *drive,int mask) { -ide_hwif_t *hwif =HWIF (drive); +ide_hwif_t *hwif = drive->hwif;struct pci_dev *dev =to_pci_dev (hwif->dev);struct hpt_info *info =hpt3xx_get_info (hwif->dev);
@@ -788,7 +788,7 @@ static void hpt366_dma_lost_irq(ide_drive_t *drive)static void hpt370_clear_engine (ide_drive_t *drive) { -ide_hwif_t *hwif =HWIF (drive); +ide_hwif_t *hwif = drive->hwif;struct pci_dev *dev =to_pci_dev (hwif->dev);pci_write_config_byte (dev, hwif->select_data,0x37 );
@@ -797,7 +797,7 @@ static void hpt370_clear_engine(ide_drive_t *drive)static void hpt370_irq_timeout (ide_drive_t *drive) { -ide_hwif_t *hwif =HWIF (drive); +ide_hwif_t *hwif = drive->hwif;struct pci_dev *dev =to_pci_dev (hwif->dev);u16 bfifo =0 ;u8 dma_cmd;
@@ -822,7 +822,7 @@ static void hpt370_dma_start(ide_drive_t *drive)static int hpt370_dma_end (ide_drive_t *drive) { -ide_hwif_t *hwif =HWIF (drive); +ide_hwif_t *hwif = drive->hwif;u8 dma_stat =inb (hwif->dma_base +ATA_DMA_STATUS );if (dma_stat &0x01 ) {
@@ -844,7 +844,7 @@ static void hpt370_dma_timeout(ide_drive_t *drive)/* returns 1 if DMA IRQ issued, 0 otherwise */ static int hpt374_dma_test_irq (ide_drive_t *drive) { -ide_hwif_t *hwif =HWIF (drive); +ide_hwif_t *hwif = drive->hwif;struct pci_dev *dev =to_pci_dev (hwif->dev);u16 bfifo =0 ;u8 dma_stat;
@@ -865,7 +865,7 @@ static int hpt374_dma_test_irq(ide_drive_t *drive)static int hpt374_dma_end (ide_drive_t *drive) { -ide_hwif_t *hwif =HWIF (drive); +ide_hwif_t *hwif = drive->hwif;struct pci_dev *dev =to_pci_dev (hwif->dev);u8 mcr =0 , mcr_addr = hwif->select_data;u8 bwsr =0 , mask = hwif->channel ?0x02 :0x01 ;
@@ -927,7 +927,7 @@ static void hpt3xxn_set_clock(ide_hwif_t *hwif, u8 mode)static void hpt3xxn_rw_disk (ide_drive_t *drive,struct request *rq) { -hpt3xxn_set_clock (HWIF (drive),rq_data_dir (rq) ?0x23 :0x21 ); +hpt3xxn_set_clock (drive->hwif,rq_data_dir (rq) ?0x23 :0x21 ); }/**
@@ -1349,8 +1349,6 @@ static int __devinit init_dma_hpt366(ide_hwif_t *hwif,if (ide_allocate_dma_engine (hwif))return -1 ; - hwif->dma_ops = &sff_dma_ops; -return 0 ; }
@@ -1426,6 +1424,7 @@ static const struct ide_dma_ops hpt37x_dma_ops = { .dma_test_irq = hpt374_dma_test_irq, .dma_lost_irq = ide_dma_lost_irq, .dma_timeout = ide_dma_timeout, + .dma_sff_read_status = ide_dma_sff_read_status, };static const struct ide_dma_ops hpt370_dma_ops = {
@@ -1437,6 +1436,7 @@ static const struct ide_dma_ops hpt370_dma_ops = { .dma_test_irq = ide_dma_test_irq, .dma_lost_irq = ide_dma_lost_irq, .dma_timeout = hpt370_dma_timeout, + .dma_sff_read_status = ide_dma_sff_read_status, };static const struct ide_dma_ops hpt36x_dma_ops = {
@@ -1448,6 +1448,7 @@ static const struct ide_dma_ops hpt36x_dma_ops = { .dma_test_irq = ide_dma_test_irq, .dma_lost_irq = hpt366_dma_lost_irq, .dma_timeout = ide_dma_timeout, + .dma_sff_read_status = ide_dma_sff_read_status, };static const struct ide_port_info hpt366_chipsets[]__devinitdata = {
drivers/ide/icside.c +6 -6
@@ -166,7 +166,7 @@ static const expansioncard_ops_t icside_ops_arcin_v6 = {*/ static void icside_maskproc (ide_drive_t *drive,int mask) { -ide_hwif_t *hwif =HWIF (drive); +ide_hwif_t *hwif = drive->hwif;struct expansion_card *ec =ECARD_DEV (hwif->dev);struct icside_state *state =ecard_get_drvdata (ec);unsigned long flags;
@@ -284,7 +284,7 @@ static void icside_dma_host_set(ide_drive_t *drive, int on)static int icside_dma_end (ide_drive_t *drive) { -ide_hwif_t *hwif =HWIF (drive); +ide_hwif_t *hwif = drive->hwif;struct expansion_card *ec =ECARD_DEV (hwif->dev); drive->waiting_for_dma =0 ;
@@ -299,7 +299,7 @@ static int icside_dma_end(ide_drive_t *drive)static void icside_dma_start (ide_drive_t *drive) { -ide_hwif_t *hwif =HWIF (drive); +ide_hwif_t *hwif = drive->hwif;struct expansion_card *ec =ECARD_DEV (hwif->dev);/* We can not enable DMA on both channels simultaneously. */
@@ -309,10 +309,10 @@ static void icside_dma_start(ide_drive_t *drive)static int icside_dma_setup (ide_drive_t *drive) { -ide_hwif_t *hwif =HWIF (drive); +ide_hwif_t *hwif = drive->hwif;struct expansion_card *ec =ECARD_DEV (hwif->dev);struct icside_state *state =ecard_get_drvdata (ec); -struct request *rq = hwif->hwgroup->rq; +struct request *rq = hwif->rq;unsigned int dma_mode;if (rq_data_dir (rq))
@@ -362,7 +362,7 @@ static void icside_dma_exec_cmd(ide_drive_t *drive, u8 cmd)static int icside_dma_test_irq (ide_drive_t *drive) { -ide_hwif_t *hwif =HWIF (drive); +ide_hwif_t *hwif = drive->hwif;struct expansion_card *ec =ECARD_DEV (hwif->dev);struct icside_state *state =ecard_get_drvdata (ec);
drivers/ide/ide-acpi.c +9 -13
@@ -218,7 +218,7 @@ static acpi_handle ide_acpi_hwif_get_handle(ide_hwif_t *hwif)*/ static acpi_handle ide_acpi_drive_get_handle (ide_drive_t *drive) { -ide_hwif_t *hwif =HWIF (drive); +ide_hwif_t *hwif = drive->hwif;int port;acpi_handle drive_handle;
@@ -263,7 +263,7 @@ static int do_drive_get_GTF(ide_drive_t *drive,acpi_status status;struct acpi_buffer output;union acpi_object *out_obj; -ide_hwif_t *hwif =HWIF (drive); +ide_hwif_t *hwif = drive->hwif;struct device *dev = hwif->gendev.parent;int err = -ENODEV ;int port;
@@ -641,7 +641,8 @@ void ide_acpi_push_timing(ide_hwif_t *hwif)*/ void ide_acpi_set_state (ide_hwif_t *hwif,int on) { -int unit; +ide_drive_t *drive; +int i;if (ide_noacpi || ide_noacpi_psx)return ;
@@ -655,9 +656,8 @@ void ide_acpi_set_state(ide_hwif_t *hwif, int on)/* channel first and then drives for power on and verse versa for power off */ if (on)acpi_bus_set_power (hwif->acpidata->obj_handle,ACPI_STATE_D0 ); -for (unit =0 ; unit <MAX_DRIVES ; ++unit) { -ide_drive_t *drive = &hwif->drives[unit]; +ide_port_for_each_dev (i, drive, hwif) {if (!drive->acpidata->obj_handle) drive->acpidata->obj_handle =ide_acpi_drive_get_handle (drive);
@@ -711,15 +711,13 @@ void ide_acpi_port_init_devices(ide_hwif_t *hwif)* for both drives, regardless whether they are connected * or not. */ - hwif->drives[0 ].acpidata = &hwif->acpidata->master; - hwif->drives[1 ].acpidata = &hwif->acpidata->slave; + hwif->devices[0 ]->acpidata = &hwif->acpidata->master; + hwif->devices[1 ]->acpidata = &hwif->acpidata->slave;/* * Send IDENTIFY for each drive */ -for (i =0 ; i <MAX_DRIVES ; i++) { - drive = &hwif->drives[i]; - +ide_port_for_each_dev (i, drive, hwif) {memset (drive->acpidata,0 ,sizeof (*drive->acpidata));if ((drive->dev_flags &IDE_DFLAG_PRESENT ) ==0 )
@@ -744,9 +742,7 @@ void ide_acpi_port_init_devices(ide_hwif_t *hwif)ide_acpi_get_timing (hwif);ide_acpi_push_timing (hwif); -for (i =0 ; i <MAX_DRIVES ; i++) { - drive = &hwif->drives[i]; - +ide_port_for_each_dev (i, drive, hwif) {if (drive->dev_flags &IDE_DFLAG_PRESENT )/* Execute ACPI startup code */ ide_acpi_exec_tfs (drive);
drivers/ide/ide-atapi.c +8 -5
@@ -243,7 +243,7 @@ EXPORT_SYMBOL_GPL(ide_retry_pc);int ide_cd_expiry (ide_drive_t *drive) { -struct request *rq =HWGROUP (drive)->rq; +struct request *rq = drive->hwif->rq;unsigned long wait =0 ;debug_log ("%s: rq->cmd[0]: 0x%x\n" , __func__, rq->cmd[0 ]);
@@ -294,7 +294,7 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive) {struct ide_atapi_pc *pc = drive->pc;ide_hwif_t *hwif = drive->hwif; -struct request *rq = hwif->hwgroup->rq; +struct request *rq = hwif->rq;const struct ide_tp_ops *tp_ops = hwif->tp_ops;xfer_func_t *xferfunc;unsigned int timeout, temp;
@@ -491,7 +491,7 @@ static ide_startstop_t ide_transfer_pc(ide_drive_t *drive) {struct ide_atapi_pc *uninitialized_var (pc );ide_hwif_t *hwif = drive->hwif; -struct request *rq = hwif->hwgroup->rq; +struct request *rq = hwif->rq;ide_expiry_t *expiry;unsigned int timeout;int cmd_len;
@@ -549,7 +549,10 @@ static ide_startstop_t ide_transfer_pc(ide_drive_t *drive) }/* Set the interrupt routine */ -ide_set_handler (drive, ide_pc_intr, timeout, expiry); +ide_set_handler (drive, + (dev_is_idecd (drive) ? drive->irq_handler + : ide_pc_intr), + timeout, expiry);/* Begin DMA, if necessary */ if (dev_is_idecd (drive)) {
@@ -580,7 +583,7 @@ ide_startstop_t ide_issue_pc(ide_drive_t *drive)if (dev_is_idecd (drive)) { tf_flags =IDE_TFLAG_OUT_NSECT |IDE_TFLAG_OUT_LBAL ; - bcount =ide_cd_get_xferlen (hwif->hwgroup->rq); + bcount =ide_cd_get_xferlen (hwif->rq); expiry = ide_cd_expiry; timeout =ATAPI_WAIT_PC ;
drivers/ide/ide-cd.c +8 -110
178 lines not on this page · raw message
drivers/ide/ide-cd.h +17 -17
@@ -33,33 +33,33 @@/* Structure of a MSF cdrom address. */ struct atapi_msf { -byte reserved; -byte minute; -byte second; -byte frame; +u8 reserved; +u8 minute; +u8 second; +u8 frame; };/* Space to hold the disk TOC. */ #define MAX_TRACKS 99struct atapi_toc_header {unsigned short toc_length; -byte first_track; -byte last_track; +u8 first_track; +u8 last_track; };struct atapi_toc_entry { -byte reserved1; +u8 reserved1;#if defined(__BIG_ENDIAN_BITFIELD) -__u8 adr :4 ; -__u8 control :4 ; +u8 adr :4 ; +u8 control :4 ;#elif defined(__LITTLE_ENDIAN_BITFIELD) -__u8 control :4 ; -__u8 adr :4 ; +u8 control :4 ; +u8 adr :4 ;#else #error "Please fix <asm/byteorder.h>"#endif -byte track; -byte reserved2; +u8 track; +u8 reserved2;union {unsigned lba;struct atapi_msf msf;
@@ -77,10 +77,10 @@ struct atapi_toc {/* Extra per-device info for cdrom drives. */ struct cdrom_info { -ide_drive_t *drive; -ide_driver_t *driver; -struct gendisk *disk; -struct kref kref; +ide_drive_t *drive; +struct ide_driver *driver; +struct gendisk *disk; +struct kref kref;/* Buffer for table of contents. NULL if we haven't allocated a TOC buffer for this device yet. */
drivers/ide/ide-disk.c +2 -2
@@ -89,7 +89,7 @@ static void ide_tf_set_cmd(ide_drive_t *drive, ide_task_t *task, u8 dma)static ide_startstop_t __ide_do_rw_disk (ide_drive_t *drive,struct request *rq,sector_t block) { -ide_hwif_t *hwif =HWIF (drive); +ide_hwif_t *hwif = drive->hwif;u16 nsectors = (u16 )rq->nr_sectors;u8 lba48 = !!(drive->dev_flags &IDE_DFLAG_LBA48 );u8 dma = !!(drive->dev_flags &IDE_DFLAG_USING_DMA );
@@ -187,7 +187,7 @@ static ide_startstop_t __ide_do_rw_disk(ide_drive_t *drive, struct request *rq,static ide_startstop_t ide_do_rw_disk (ide_drive_t *drive,struct request *rq,sector_t block) { -ide_hwif_t *hwif =HWIF (drive); +ide_hwif_t *hwif = drive->hwif;BUG_ON (drive->dev_flags &IDE_DFLAG_BLOCKED );
drivers/ide/ide-dma-sff.c +35 -28
142 lines not on this page · raw message
drivers/ide/ide-dma.c +1 -1
@@ -96,7 +96,7 @@ ide_startstop_t ide_dma_intr(ide_drive_t *drive)if (OK_STAT (stat,DRIVE_READY , drive->bad_wstat |ATA_DRQ )) {if (!dma_stat) { -struct request *rq = hwif->hwgroup->rq; +struct request *rq = hwif->rq;task_end_request (drive, rq, stat);return ide_stopped;
drivers/ide/ide-floppy.c +1 -1
@@ -71,7 +71,7 @@static int ide_floppy_end_request (ide_drive_t *drive,int uptodate,int nsecs) {struct ide_disk_obj *floppy = drive->driver_data; -struct request *rq =HWGROUP (drive)->rq; +struct request *rq = drive->hwif->rq;int error;ide_debug_log (IDE_DBG_FUNC ,"Call %s\n" , __func__);
drivers/ide/ide-gd.c +1 -2
@@ -149,7 +149,7 @@ static int ide_gd_end_request(ide_drive_t *drive, int uptodate, int nrsecs)return drive->disk_ops->end_request (drive, uptodate, nrsecs); } -static ide_driver_t ide_gd_driver = { +static struct ide_driver ide_gd_driver = { .gen_driver = { .owner =THIS_MODULE , .name ="ide-gd" ,
@@ -162,7 +162,6 @@ static ide_driver_t ide_gd_driver = { .version = IDE_GD_VERSION, .do_request = ide_gd_do_request, .end_request = ide_gd_end_request, - .error = __ide_error, #ifdef CONFIG_IDE_PROC_FS .proc_entries = ide_disk_proc_entries, .proc_devsets = ide_disk_proc_devsets,
drivers/ide/ide-gd.h +5 -5
@@ -14,11 +14,11 @@#endif struct ide_disk_obj { -ide_drive_t *drive; -ide_driver_t *driver; -struct gendisk *disk; -struct kref kref; -unsigned int openers;/* protected by BKL for now */ +ide_drive_t *drive; +struct ide_driver *driver; +struct gendisk *disk; +struct kref kref; +unsigned int openers;/* protected by BKL for now */ /* Last failed packet command */ struct ide_atapi_pc *failed_pc;
drivers/ide/ide-h8300.c +0 -1
@@ -159,7 +159,6 @@ static const struct ide_tp_ops h8300_tp_ops = { .exec_command = ide_exec_command, .read_status = ide_read_status, .read_altstatus = ide_read_altstatus, - .read_sff_dma_status = ide_read_sff_dma_status, .set_irq = ide_set_irq,
drivers/ide/ide-io.c +198 -212
700 lines not on this page · raw message
drivers/ide/ide-iops.c +41 -59
265 lines not on this page · raw message
drivers/ide/ide-lib.c +6 -3
@@ -273,7 +273,7 @@ int ide_set_xfer_rate(ide_drive_t *drive, u8 rate)static void ide_dump_opcode (ide_drive_t *drive) { -struct request *rq = drive->hwif->hwgroup->rq; +struct request *rq = drive->hwif->rq;ide_task_t *task =NULL ;if (!rq)
@@ -346,10 +346,13 @@ static void ide_dump_ata_error(ide_drive_t *drive, u8 err)printk (KERN_CONT "}" );if ((err & (ATA_BBK |ATA_ABORTED )) ==ATA_BBK || (err & (ATA_UNC |ATA_IDNF |ATA_AMNF ))) { +struct request *rq = drive->hwif->rq; +ide_dump_sector (drive); -if (HWGROUP (drive) &&HWGROUP (drive)->rq) + +if (rq)printk (KERN_CONT ", sector=%llu" , - (unsigned long long )HWGROUP (drive)->rq->sector); + (unsigned long long )rq->sector); }printk (KERN_CONT "\n" ); }
drivers/ide/ide-park.c +8 -8
@@ -7,22 +7,22 @@ DECLARE_WAIT_QUEUE_HEAD(ide_park_wq);static void issue_park_cmd (ide_drive_t *drive,unsigned long timeout) { -ide_hwgroup_t *hwgroup = drive->hwif->hwgroup; +ide_hwif_t *hwif = drive->hwif;struct request_queue *q = drive->queue;struct request *rq;int rc; timeout += jiffies; -spin_lock_irq (&hwgroup->lock); +spin_lock_irq (&hwif->lock);if (drive->dev_flags &IDE_DFLAG_PARKED ) {int reset_timer =time_before (timeout, drive->sleep);int start_queue =0 ; drive->sleep = timeout;wake_up_all (&ide_park_wq); -if (reset_timer &&del_timer (&hwgroup->timer)) +if (reset_timer &&del_timer (&hwif->timer)) start_queue =1 ; -spin_unlock_irq (&hwgroup->lock); +spin_unlock_irq (&hwif->lock);if (start_queue) {spin_lock_irq (q->queue_lock);
@@ -31,7 +31,7 @@ static void issue_park_cmd(ide_drive_t *drive, unsigned long timeout) }return ; } -spin_unlock_irq (&hwgroup->lock); +spin_unlock_irq (&hwif->lock); rq =blk_get_request (q,READ , __GFP_WAIT); rq->cmd[0 ] =REQ_PARK_HEADS ;
@@ -64,21 +64,21 @@ ssize_t ide_park_show(struct device *dev, struct device_attribute *attr, char *buf) {ide_drive_t *drive =to_ide_device (dev); -ide_hwgroup_t *hwgroup = drive->hwif->hwgroup; +ide_hwif_t *hwif = drive->hwif;unsigned long now;unsigned int msecs;if (drive->dev_flags &IDE_DFLAG_NO_UNLOAD )return -EOPNOTSUPP ; -spin_lock_irq (&hwgroup->lock); +spin_lock_irq (&hwif->lock); now = jiffies;if (drive->dev_flags &IDE_DFLAG_PARKED &&time_after (drive->sleep, now)) msecs =jiffies_to_msecs (drive->sleep - now);else msecs =0 ; -spin_unlock_irq (&hwgroup->lock); +spin_unlock_irq (&hwif->lock);return snprintf (buf,20 ,"%u\n" , msecs); }
drivers/ide/ide-pm.c +4 -4
@@ -5,7 +5,7 @@int generic_ide_suspend (struct device *dev,pm_message_t mesg) {ide_drive_t *drive = dev->driver_data, *pair =ide_get_pair_dev (drive); -ide_hwif_t *hwif =HWIF (drive); +ide_hwif_t *hwif = drive->hwif;struct request *rq;struct request_pm_state rqpm;ide_task_t args;
@@ -39,7 +39,7 @@ int generic_ide_suspend(struct device *dev, pm_message_t mesg)int generic_ide_resume (struct device *dev) {ide_drive_t *drive = dev->driver_data, *pair =ide_get_pair_dev (drive); -ide_hwif_t *hwif =HWIF (drive); +ide_hwif_t *hwif = drive->hwif;struct request *rq;struct request_pm_state rqpm;ide_task_t args;
@@ -67,7 +67,7 @@ int generic_ide_resume(struct device *dev)blk_put_request (rq);if (err ==0 && dev->driver) { -ide_driver_t *drv =to_ide_driver (dev->driver); +struct ide_driver *drv =to_ide_driver (dev->driver);if (drv->resume) drv->resume (drive);
@@ -194,7 +194,7 @@ void ide_complete_pm_request(ide_drive_t *drive, struct request *rq) }spin_unlock_irqrestore (q->queue_lock, flags); - drive->hwif->hwgroup->rq =NULL ; + drive->hwif->rq =NULL ;if (blk_end_request (rq,0 ,0 ))BUG ();
drivers/ide/ide-probe.c +240 -234
787 lines not on this page · raw message
drivers/ide/ide-proc.c +11 -12
@@ -439,13 +439,13 @@ static int proc_ide_read_dmodelstatic int proc_ide_read_driver (char *page,char **start,off_t off,int count,int *eof,void *data) { -ide_drive_t *drive = (ide_drive_t *) data; -struct device *dev = &drive->gendev; -ide_driver_t *ide_drv; -int len; +ide_drive_t *drive = (ide_drive_t *)data; +struct device *dev = &drive->gendev; +struct ide_driver *ide_drv; +int len;if (dev->driver) { - ide_drv =container_of (dev->driver, ide_driver_t, gen_driver); + ide_drv =to_ide_driver (dev->driver); len =sprintf (page,"%s version %s\n" , dev->driver->name, ide_drv->version); }else
@@ -555,7 +555,7 @@ static void ide_remove_proc_entries(struct proc_dir_entry *dir, ide_proc_entry_t } } -void ide_proc_register_driver (ide_drive_t *drive,ide_driver_t *driver) +void ide_proc_register_driver (ide_drive_t *drive,struct ide_driver *driver) {mutex_lock (&ide_setting_mtx); drive->settings = driver->proc_devsets (drive);
@@ -577,7 +577,7 @@ EXPORT_SYMBOL(ide_proc_register_driver);* Takes ide_setting_mtx. */ -void ide_proc_unregister_driver (ide_drive_t *drive,ide_driver_t *driver) +void ide_proc_unregister_driver (ide_drive_t *drive,struct ide_driver *driver) {ide_remove_proc_entries (drive->proc, driver->proc_entries (drive));
@@ -593,14 +593,13 @@ EXPORT_SYMBOL(ide_proc_unregister_driver);void ide_proc_port_register_devices (ide_hwif_t *hwif) { -int d;struct proc_dir_entry *ent;struct proc_dir_entry *parent = hwif->proc; +ide_drive_t *drive;char name[64 ]; +int i; -for (d =0 ; d <MAX_DRIVES ; d++) { -ide_drive_t *drive = &hwif->drives[d]; - +ide_port_for_each_dev (i, drive, hwif) {if ((drive->dev_flags &IDE_DFLAG_PRESENT ) ==0 || drive->proc)continue ;
@@ -653,7 +652,7 @@ void ide_proc_unregister_port(ide_hwif_t *hwif)static int proc_print_driver (struct device_driver *drv,void *data) { -ide_driver_t *ide_drv =container_of (drv, ide_driver_t, gen_driver); +struct ide_driver *ide_drv =to_ide_driver (drv);struct seq_file *s = data;seq_printf (s,"%s version %s\n" , drv->name, ide_drv->version);
drivers/ide/ide-tape.c +10 -10
@@ -166,10 +166,10 @@ struct idetape_bh {* to an interrupt or a timer event is stored in the struct defined below. */ typedef struct ide_tape_obj { - ide_drive_t *drive; - ide_driver_t *driver; - struct gendisk *disk; - struct kref kref; + ide_drive_t *drive; + struct ide_driver *driver; + struct gendisk *disk; + struct kref kref; /* * failed_pc points to the last failed packet command, or contains
@@ -479,7 +479,7 @@ static void ide_tape_kfree_buffer(idetape_tape_t *tape)static int idetape_end_request (ide_drive_t *drive,int uptodate,int nr_sects) { -struct request *rq =HWGROUP (drive)->rq; +struct request *rq = drive->hwif->rq;idetape_tape_t *tape = drive->driver_data;unsigned long flags;int error;
@@ -531,7 +531,7 @@ static void ide_tape_callback(ide_drive_t *drive, int dsc)printk (KERN_ERR "ide-tape: Error in REQUEST SENSE " "itself - Aborting request!\n" ); }else if (pc->c[0 ] ==READ_6 || pc->c[0 ] ==WRITE_6 ) { -struct request *rq = drive->hwif->hwgroup->rq; +struct request *rq = drive->hwif->rq;int blocks = pc->xferred / tape->blk_size; tape->avg_size += blocks * tape->blk_size;
@@ -576,7 +576,7 @@ static void ide_tape_callback(ide_drive_t *drive, int dsc)/* * Postpone the current request so that ide.c will be able to service requests -* from another device on the same hwgroup while we are polling for DSC. +* from another device on the same port while we are polling for DSC. */ static void idetape_postpone_request (ide_drive_t *drive) {
@@ -584,7 +584,8 @@ static void idetape_postpone_request(ide_drive_t *drive)debug_log (DBG_PROCS ,"Enter %s\n" , __func__); - tape->postponed_rq =HWGROUP (drive)->rq; + tape->postponed_rq = drive->hwif->rq; +ide_stall_queue (drive, tape->dsc_poll_freq); }
@@ -2312,7 +2313,7 @@ static const struct ide_proc_devset *ide_tape_proc_devsets(ide_drive_t *drive)static int ide_tape_probe (ide_drive_t *); -static ide_driver_t idetape_driver = { +static struct ide_driver idetape_driver = { .gen_driver = { .owner =THIS_MODULE , .name ="ide-tape" ,
@@ -2323,7 +2324,6 @@ static ide_driver_t idetape_driver = { .version = IDETAPE_VERSION, .do_request = idetape_do_request, .end_request = idetape_end_request, - .error = __ide_error, #ifdef CONFIG_IDE_PROC_FS .proc_entries = ide_tape_proc_entries, .proc_devsets = ide_tape_proc_devsets,
drivers/ide/ide-taskfile.c +7 -7
@@ -58,7 +58,7 @@ static ide_startstop_t task_in_intr(ide_drive_t *);ide_startstop_t do_rw_taskfile (ide_drive_t *drive,ide_task_t *task) { -ide_hwif_t *hwif =HWIF (drive); +ide_hwif_t *hwif = drive->hwif;struct ide_taskfile *tf = &task->tf;ide_handler_t *handler =NULL ;const struct ide_tp_ops *tp_ops = hwif->tp_ops;
@@ -309,9 +309,9 @@ static ide_startstop_t task_error(ide_drive_t *drive, struct request *rq, }if (sectors >0 ) { -ide_driver_t *drv; +struct ide_driver *drv; - drv = *(ide_driver_t **)rq->rq_disk->private_data; + drv = *(struct ide_driver **)rq->rq_disk->private_data; drv->end_request (drive,1 , sectors); } }
@@ -328,9 +328,9 @@ void task_end_request(ide_drive_t *drive, struct request *rq, u8 stat) }if (rq->rq_disk) { -ide_driver_t *drv; +struct ide_driver *drv; - drv = *(ide_driver_t **)rq->rq_disk->private_data;; + drv = *(struct ide_driver **)rq->rq_disk->private_data;; drv->end_request (drive,1 , rq->nr_sectors); }else ide_end_request (drive,1 , rq->nr_sectors);
@@ -361,7 +361,7 @@ static ide_startstop_t task_in_unexpected(ide_drive_t *drive, struct request *rqstatic ide_startstop_t task_in_intr (ide_drive_t *drive) {ide_hwif_t *hwif = drive->hwif; -struct request *rq = hwif->hwgroup->rq; +struct request *rq = hwif->rq;u8 stat = hwif->tp_ops->read_status (hwif);/* Error? */
@@ -395,7 +395,7 @@ static ide_startstop_t task_in_intr(ide_drive_t *drive)static ide_startstop_t task_out_intr (ide_drive_t *drive) {ide_hwif_t *hwif = drive->hwif; -struct request *rq =HWGROUP (drive)->rq; +struct request *rq = hwif->rq;u8 stat = hwif->tp_ops->read_status (hwif);
Lines of this file are not shown. View the raw message.
drivers/ide/ide.c +8 -179
187 lines not on this page · raw message
drivers/ide/it8172.c new file +166 -0
166 lines not on this page · raw message
include/linux/ide.h +64 -107
171 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.