* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: Fix Maple PATA IRQ assignment. ahci: use 0x80 as wait stat value instead of 0xff sata_via: style clean up, no indirect method call in LLD ahci: fix endianness in spurious interrupt message libata-sff: Don't call bmdma_stop on non DMA capable controllers libata: implement ATA_FLAG_IGN_SIMPLEX and use it in sata_uli ahci: improve and limit spurious interrupt messages, take#3 sata_via: don't diddle with ATA_NIEN in ->freeze libata: set_mode, Fix the FIXME libata hpt3xn: Hopefully sort out the DPLL logic versus the vendor code libata cmd64x: whack into a shape that looks like the documentation
Showing the changes to include/linux (1 of 17 files). Show all
Unified · Split
| @@ -177,6 +177,7 @@ enum { · 176 unmodified lines | ||
| 177 | 177 | * Register FIS clearing BSY */ |
| 178 | 178 | ATA_FLAG_DEBUGMSG = (1 << 13), |
| 179 | 179 | ATA_FLAG_SETXFER_POLLING= (1 << 14), /* use polling for SETXFER */ |
| 180 | + ATA_FLAG_IGN_SIMPLEX = (1 << 15), /* ignore SIMPLEX */ | |
| 180 | 181 | |
| 181 | 182 | /* The following flag belongs to ap->pflags but is kept in |
| 182 | 183 | * ap->flags because it's referenced in many LLDs and will be |
| @@ -612,11 +613,11 @@ struct ata_port_operations { · 429 unmodified lines | ||
| 612 | 613 | void (*dev_select)(struct ata_port *ap, unsigned int device); |
| 613 | 614 | |
| 614 | 615 | void (*phy_reset) (struct ata_port *ap); /* obsolete */ |
| 615 | − void (*set_mode) (struct ata_port *ap); | |
| 616 | + int (*set_mode) (struct ata_port *ap, struct ata_device **r_failed_dev); | |
| 616 | 617 | |
| 617 | 618 | void (*post_set_mode) (struct ata_port *ap); |
| 618 | 619 | |
| 619 | − int (*check_atapi_dma) (struct ata_queued_cmd *qc); | |
| 620 | + int (*check_atapi_dma) (struct ata_queued_cmd *qc); | |
| 620 | 621 | |
| 621 | 622 | void (*bmdma_setup) (struct ata_queued_cmd *qc); |
| 622 | 623 | void (*bmdma_start) (struct ata_queued_cmd *qc); |