Merge branch 'for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
Pull libata changes from Tejun Heo: "The only interesting piece is the support for shingled drives. The changes in libata layer are minimal. All it does is identifying the new class of device and report upwards accordingly" * 'for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata: libata: Remove FIXME comment in atapi_request_sense() sata_rcar: Document deprecated "renesas,rcar-sata" sata_rcar: Add clocks to sata_rcar bindings ahci_sunxi: Make AHCI_HFLAG_NO_PMP flag configurable with a module option libata-scsi: Update SATL for ZAC drives libata: Implement ATA_DEV_ZAC libsas: use ata_dev_classify()
This commit is contained in:
@@ -4367,7 +4367,7 @@ static int pm8001_chip_sata_req(struct pm8001_hba_info *pm8001_ha,
|
||||
PM8001_IO_DBG(pm8001_ha, pm8001_printk("PIO\n"));
|
||||
}
|
||||
if (task->ata_task.use_ncq &&
|
||||
dev->sata_dev.command_set != ATAPI_COMMAND_SET) {
|
||||
dev->sata_dev.class != ATA_DEV_ATAPI) {
|
||||
ATAP = 0x07; /* FPDMA */
|
||||
PM8001_IO_DBG(pm8001_ha, pm8001_printk("FPDMA\n"));
|
||||
}
|
||||
|
@@ -4077,7 +4077,7 @@ static int pm80xx_chip_sata_req(struct pm8001_hba_info *pm8001_ha,
|
||||
PM8001_IO_DBG(pm8001_ha, pm8001_printk("PIO\n"));
|
||||
}
|
||||
if (task->ata_task.use_ncq &&
|
||||
dev->sata_dev.command_set != ATAPI_COMMAND_SET) {
|
||||
dev->sata_dev.class != ATA_DEV_ATAPI) {
|
||||
ATAP = 0x07; /* FPDMA */
|
||||
PM8001_IO_DBG(pm8001_ha, pm8001_printk("FPDMA\n"));
|
||||
}
|
||||
|
Reference in New Issue
Block a user