tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

isd200: WIN_* -> ATA_CMD_*

* Use ATA_CMD_* defines instead of WIN_* ones.

Cc: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Bartlomiej Zolnierkiewicz f08f31f7 6fd5c665

+5 -5
+5 -5
drivers/usb/storage/isd200.c
··· 548 548 ata.generic.ActionSelect = ACTION_SELECT_1|ACTION_SELECT_5; 549 549 ata.generic.RegisterSelect = REG_DEVICE_HEAD | REG_COMMAND; 550 550 ata.write.DeviceHeadByte = info->DeviceHead; 551 - ata.write.CommandByte = WIN_SRST; 551 + ata.write.CommandByte = ATA_CMD_DEV_RESET; 552 552 isd200_set_srb(info, DMA_NONE, NULL, 0); 553 553 break; 554 554 555 555 case ACTION_IDENTIFY: 556 556 US_DEBUGP(" isd200_action(IDENTIFY)\n"); 557 557 ata.generic.RegisterSelect = REG_COMMAND; 558 - ata.write.CommandByte = WIN_IDENTIFY; 558 + ata.write.CommandByte = ATA_CMD_ID_ATA; 559 559 isd200_set_srb(info, DMA_FROM_DEVICE, info->id, 560 560 ATA_ID_WORDS * 2); 561 561 break; ··· 1335 1335 ataCdb->write.CylinderHighByte = (unsigned char)(cylinder>>8); 1336 1336 ataCdb->write.CylinderLowByte = (unsigned char)cylinder; 1337 1337 ataCdb->write.DeviceHeadByte = (head | ATA_ADDRESS_DEVHEAD_STD); 1338 - ataCdb->write.CommandByte = WIN_READ; 1338 + ataCdb->write.CommandByte = ATA_CMD_PIO_READ; 1339 1339 break; 1340 1340 1341 1341 case WRITE_10: ··· 1367 1367 ataCdb->write.CylinderHighByte = (unsigned char)(cylinder>>8); 1368 1368 ataCdb->write.CylinderLowByte = (unsigned char)cylinder; 1369 1369 ataCdb->write.DeviceHeadByte = (head | ATA_ADDRESS_DEVHEAD_STD); 1370 - ataCdb->write.CommandByte = WIN_WRITE; 1370 + ataCdb->write.CommandByte = ATA_CMD_PIO_WRITE; 1371 1371 break; 1372 1372 1373 1373 case ALLOW_MEDIUM_REMOVAL: ··· 1381 1381 ataCdb->generic.TransferBlockSize = 1; 1382 1382 ataCdb->generic.RegisterSelect = REG_COMMAND; 1383 1383 ataCdb->write.CommandByte = (srb->cmnd[4] & 0x1) ? 1384 - WIN_DOORLOCK : WIN_DOORUNLOCK; 1384 + ATA_CMD_MEDIA_LOCK : ATA_CMD_MEDIA_UNLOCK; 1385 1385 isd200_srb_set_bufflen(srb, 0); 1386 1386 } else { 1387 1387 US_DEBUGP(" Not removeable media, just report okay\n");