Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 1d2808fd3d2d5d2c0483796a0f443d1cb3f11367

Authored by Jeff Garzik
1 parent 5bcd7a00a4
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

[libata] PATA drivers: remove ATA_FLAG_SRST 

This flag only has meaning in old-EH drivers, and these drivers have
already been converted to the new EH.  Remove.

Signed-off-by: Jeff Garzik <jeff@garzik.org>

Showing 34 changed files with 78 additions and 78 deletions Side-by-side Diff

drivers/ata/ata_generic.c
Diff comments   View file @ 1d2808f
... ... @@ -143,7 +143,7 @@
143 143 u16 command;
144 144 static const struct ata_port_info info = {
145 145 .sht = &generic_sht,
146   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
  146 + .flags = ATA_FLAG_SLAVE_POSS,
147 147 .pio_mask = 0x1f,
148 148 .mwdma_mask = 0x07,
149 149 .udma_mask = 0x3f,
drivers/ata/pata_ali.c
Diff comments   View file @ 1d2808f
... ... @@ -520,14 +520,14 @@
520 520 {
521 521 static const struct ata_port_info info_early = {
522 522 .sht = &ali_sht,
523   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
  523 + .flags = ATA_FLAG_SLAVE_POSS,
524 524 .pio_mask = 0x1f,
525 525 .port_ops = &ali_early_port_ops
526 526 };
527 527 /* Revision 0x20 added DMA */
528 528 static const struct ata_port_info info_20 = {
529 529 .sht = &ali_sht,
530   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST | ATA_FLAG_PIO_LBA48,
  530 + .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_PIO_LBA48,
531 531 .pio_mask = 0x1f,
532 532 .mwdma_mask = 0x07,
533 533 .port_ops = &ali_20_port_ops
... ... @@ -535,7 +535,7 @@
535 535 /* Revision 0x20 with support logic added UDMA */
536 536 static const struct ata_port_info info_20_udma = {
537 537 .sht = &ali_sht,
538   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST | ATA_FLAG_PIO_LBA48,
  538 + .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_PIO_LBA48,
539 539 .pio_mask = 0x1f,
540 540 .mwdma_mask = 0x07,
541 541 .udma_mask = 0x07, /* UDMA33 */
... ... @@ -544,7 +544,7 @@
544 544 /* Revision 0xC2 adds UDMA66 */
545 545 static const struct ata_port_info info_c2 = {
546 546 .sht = &ali_sht,
547   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST | ATA_FLAG_PIO_LBA48,
  547 + .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_PIO_LBA48,
548 548 .pio_mask = 0x1f,
549 549 .mwdma_mask = 0x07,
550 550 .udma_mask = 0x1f,
... ... @@ -553,7 +553,7 @@
553 553 /* Revision 0xC3 is UDMA66 for now */
554 554 static const struct ata_port_info info_c3 = {
555 555 .sht = &ali_sht,
556   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST | ATA_FLAG_PIO_LBA48,
  556 + .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_PIO_LBA48,
557 557 .pio_mask = 0x1f,
558 558 .mwdma_mask = 0x07,
559 559 .udma_mask = 0x1f,
... ... @@ -562,7 +562,7 @@
562 562 /* Revision 0xC4 is UDMA100 */
563 563 static const struct ata_port_info info_c4 = {
564 564 .sht = &ali_sht,
565   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST | ATA_FLAG_PIO_LBA48,
  565 + .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_PIO_LBA48,
566 566 .pio_mask = 0x1f,
567 567 .mwdma_mask = 0x07,
568 568 .udma_mask = 0x3f,
... ... @@ -571,7 +571,7 @@
571 571 /* Revision 0xC5 is UDMA133 with LBA48 DMA */
572 572 static const struct ata_port_info info_c5 = {
573 573 .sht = &ali_sht,
574   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
  574 + .flags = ATA_FLAG_SLAVE_POSS,
575 575 .pio_mask = 0x1f,
576 576 .mwdma_mask = 0x07,
577 577 .udma_mask = 0x7f,
drivers/ata/pata_amd.c
Diff comments   View file @ 1d2808f
... ... @@ -541,7 +541,7 @@
541 541 static const struct ata_port_info info[10] = {
542 542 { /* 0: AMD 7401 */
543 543 .sht = &amd_sht,
544   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
  544 + .flags = ATA_FLAG_SLAVE_POSS,
545 545 .pio_mask = 0x1f,
546 546 .mwdma_mask = 0x07, /* No SWDMA */
547 547 .udma_mask = 0x07, /* UDMA 33 */
... ... @@ -549,7 +549,7 @@
549 549 },
550 550 { /* 1: Early AMD7409 - no swdma */
551 551 .sht = &amd_sht,
552   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
  552 + .flags = ATA_FLAG_SLAVE_POSS,
553 553 .pio_mask = 0x1f,
554 554 .mwdma_mask = 0x07,
555 555 .udma_mask = 0x1f, /* UDMA 66 */
... ... @@ -557,7 +557,7 @@
557 557 },
558 558 { /* 2: AMD 7409, no swdma errata */
559 559 .sht = &amd_sht,
560   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
  560 + .flags = ATA_FLAG_SLAVE_POSS,
561 561 .pio_mask = 0x1f,
562 562 .mwdma_mask = 0x07,
563 563 .udma_mask = 0x1f, /* UDMA 66 */
... ... @@ -565,7 +565,7 @@
565 565 },
566 566 { /* 3: AMD 7411 */
567 567 .sht = &amd_sht,
568   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
  568 + .flags = ATA_FLAG_SLAVE_POSS,
569 569 .pio_mask = 0x1f,
570 570 .mwdma_mask = 0x07,
571 571 .udma_mask = 0x3f, /* UDMA 100 */
... ... @@ -573,7 +573,7 @@
573 573 },
574 574 { /* 4: AMD 7441 */
575 575 .sht = &amd_sht,
576   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
  576 + .flags = ATA_FLAG_SLAVE_POSS,
577 577 .pio_mask = 0x1f,
578 578 .mwdma_mask = 0x07,
579 579 .udma_mask = 0x3f, /* UDMA 100 */
... ... @@ -581,7 +581,7 @@
581 581 },
582 582 { /* 5: AMD 8111*/
583 583 .sht = &amd_sht,
584   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
  584 + .flags = ATA_FLAG_SLAVE_POSS,
585 585 .pio_mask = 0x1f,
586 586 .mwdma_mask = 0x07,
587 587 .udma_mask = 0x7f, /* UDMA 133, no swdma */
... ... @@ -589,7 +589,7 @@
589 589 },
590 590 { /* 6: AMD 8111 UDMA 100 (Serenade) */
591 591 .sht = &amd_sht,
592   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
  592 + .flags = ATA_FLAG_SLAVE_POSS,
593 593 .pio_mask = 0x1f,
594 594 .mwdma_mask = 0x07,
595 595 .udma_mask = 0x3f, /* UDMA 100, no swdma */
... ... @@ -597,7 +597,7 @@
597 597 },
598 598 { /* 7: Nvidia Nforce */
599 599 .sht = &amd_sht,
600   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
  600 + .flags = ATA_FLAG_SLAVE_POSS,
601 601 .pio_mask = 0x1f,
602 602 .mwdma_mask = 0x07,
603 603 .udma_mask = 0x3f, /* UDMA 100 */
... ... @@ -605,7 +605,7 @@
605 605 },
606 606 { /* 8: Nvidia Nforce2 and later */
607 607 .sht = &amd_sht,
608   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
  608 + .flags = ATA_FLAG_SLAVE_POSS,
609 609 .pio_mask = 0x1f,
610 610 .mwdma_mask = 0x07,
611 611 .udma_mask = 0x7f, /* UDMA 133, no swdma */
... ... @@ -613,7 +613,7 @@
613 613 },
614 614 { /* 9: AMD CS5536 (Geode companion) */
615 615 .sht = &amd_sht,
616   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
  616 + .flags = ATA_FLAG_SLAVE_POSS,
617 617 .pio_mask = 0x1f,
618 618 .mwdma_mask = 0x07,
619 619 .udma_mask = 0x3f, /* UDMA 100 */
drivers/ata/pata_artop.c
Diff comments   View file @ 1d2808f
... ... @@ -416,7 +416,7 @@
416 416 static int printed_version;
417 417 static const struct ata_port_info info_6210 = {
418 418 .sht = &artop_sht,
419   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
  419 + .flags = ATA_FLAG_SLAVE_POSS,
420 420 .pio_mask = 0x1f, /* pio0-4 */
421 421 .mwdma_mask = 0x07, /* mwdma0-2 */
422 422 .udma_mask = ATA_UDMA2,
... ... @@ -424,7 +424,7 @@
424 424 };
425 425 static const struct ata_port_info info_626x = {
426 426 .sht = &artop_sht,
427   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
  427 + .flags = ATA_FLAG_SLAVE_POSS,
428 428 .pio_mask = 0x1f, /* pio0-4 */
429 429 .mwdma_mask = 0x07, /* mwdma0-2 */
430 430 .udma_mask = ATA_UDMA4,
... ... @@ -432,7 +432,7 @@
432 432 };
433 433 static const struct ata_port_info info_626x_fast = {
434 434 .sht = &artop_sht,
435   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
  435 + .flags = ATA_FLAG_SLAVE_POSS,
436 436 .pio_mask = 0x1f, /* pio0-4 */
437 437 .mwdma_mask = 0x07, /* mwdma0-2 */
438 438 .udma_mask = ATA_UDMA5,
drivers/ata/pata_atiixp.c
Diff comments   View file @ 1d2808f
... ... @@ -270,7 +270,7 @@
270 270 {
271 271 static const struct ata_port_info info = {
272 272 .sht = &atiixp_sht,
273   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
  273 + .flags = ATA_FLAG_SLAVE_POSS,
274 274 .pio_mask = 0x1f,
275 275 .mwdma_mask = 0x06, /* No MWDMA0 support */
276 276 .udma_mask = 0x3F,
drivers/ata/pata_cmd640.c
Diff comments   View file @ 1d2808f
... ... @@ -251,7 +251,7 @@
251 251 {
252 252 static const struct ata_port_info info = {
253 253 .sht = &cmd640_sht,
254   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
  254 + .flags = ATA_FLAG_SLAVE_POSS,
255 255 .pio_mask = 0x1f,
256 256 .port_ops = &cmd640_port_ops
257 257 };
drivers/ata/pata_cmd64x.c
Diff comments   View file @ 1d2808f
... ... @@ -380,21 +380,21 @@
380 380 static const struct ata_port_info cmd_info[6] = {
381 381 { /* CMD 643 - no UDMA */
382 382 .sht = &cmd64x_sht,
383   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
  383 + .flags = ATA_FLAG_SLAVE_POSS,
384 384 .pio_mask = 0x1f,
385 385 .mwdma_mask = 0x07,
386 386 .port_ops = &cmd64x_port_ops
387 387 },
388 388 { /* CMD 646 with broken UDMA */
389 389 .sht = &cmd64x_sht,
390   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
  390 + .flags = ATA_FLAG_SLAVE_POSS,
391 391 .pio_mask = 0x1f,
392 392 .mwdma_mask = 0x07,
393 393 .port_ops = &cmd64x_port_ops
394 394 },
395 395 { /* CMD 646 with working UDMA */
396 396 .sht = &cmd64x_sht,
397   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
  397 + .flags = ATA_FLAG_SLAVE_POSS,
398 398 .pio_mask = 0x1f,
399 399 .mwdma_mask = 0x07,
400 400 .udma_mask = ATA_UDMA1,
401 401  
... ... @@ -402,14 +402,14 @@
402 402 },
403 403 { /* CMD 646 rev 1 */
404 404 .sht = &cmd64x_sht,
405   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
  405 + .flags = ATA_FLAG_SLAVE_POSS,
406 406 .pio_mask = 0x1f,
407 407 .mwdma_mask = 0x07,
408 408 .port_ops = &cmd646r1_port_ops
409 409 },
410 410 { /* CMD 648 */
411 411 .sht = &cmd64x_sht,
412   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
  412 + .flags = ATA_FLAG_SLAVE_POSS,
413 413 .pio_mask = 0x1f,
414 414 .mwdma_mask = 0x07,
415 415 .udma_mask = ATA_UDMA2,
... ... @@ -417,7 +417,7 @@
417 417 },
418 418 { /* CMD 649 */
419 419 .sht = &cmd64x_sht,
420   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
  420 + .flags = ATA_FLAG_SLAVE_POSS,
421 421 .pio_mask = 0x1f,
422 422 .mwdma_mask = 0x07,
423 423 .udma_mask = ATA_UDMA3,
drivers/ata/pata_cs5530.c
Diff comments   View file @ 1d2808f
... ... @@ -337,7 +337,7 @@
337 337 {
338 338 static const struct ata_port_info info = {
339 339 .sht = &cs5530_sht,
340   - .flags = ATA_FLAG_SLAVE_POSS|ATA_FLAG_SRST,
  340 + .flags = ATA_FLAG_SLAVE_POSS,
341 341 .pio_mask = 0x1f,
342 342 .mwdma_mask = 0x07,
343 343 .udma_mask = 0x07,
... ... @@ -346,7 +346,7 @@
346 346 /* The docking connector doesn't do UDMA, and it seems not MWDMA */
347 347 static const struct ata_port_info info_palmax_secondary = {
348 348 .sht = &cs5530_sht,
349   - .flags = ATA_FLAG_SLAVE_POSS|ATA_FLAG_SRST,
  349 + .flags = ATA_FLAG_SLAVE_POSS,
350 350 .pio_mask = 0x1f,
351 351 .port_ops = &cs5530_port_ops
352 352 };
drivers/ata/pata_cs5535.c
Diff comments   View file @ 1d2808f
... ... @@ -225,7 +225,7 @@
225 225 {
226 226 static const struct ata_port_info info = {
227 227 .sht = &cs5535_sht,
228   - .flags = ATA_FLAG_SLAVE_POSS|ATA_FLAG_SRST,
  228 + .flags = ATA_FLAG_SLAVE_POSS,
229 229 .pio_mask = 0x1f,
230 230 .mwdma_mask = 0x07,
231 231 .udma_mask = 0x1f,
drivers/ata/pata_cypress.c
Diff comments   View file @ 1d2808f
... ... @@ -167,7 +167,7 @@
167 167 {
168 168 static const struct ata_port_info info = {
169 169 .sht = &cy82c693_sht,
170   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
  170 + .flags = ATA_FLAG_SLAVE_POSS,
171 171 .pio_mask = 0x1f,
172 172 .mwdma_mask = 0x07,
173 173 .port_ops = &cy82c693_port_ops
drivers/ata/pata_efar.c
Diff comments   View file @ 1d2808f
... ... @@ -303,7 +303,7 @@
303 303 static int printed_version;
304 304 static const struct ata_port_info info = {
305 305 .sht = &efar_sht,
306   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
  306 + .flags = ATA_FLAG_SLAVE_POSS,
307 307 .pio_mask = 0x1f, /* pio0-4 */
308 308 .mwdma_mask = 0x07, /* mwdma1-2 */
309 309 .udma_mask = 0x0f, /* UDMA 66 */
drivers/ata/pata_hpt366.c
Diff comments   View file @ 1d2808f
... ... @@ -393,7 +393,7 @@
393 393 {
394 394 static const struct ata_port_info info_hpt366 = {
395 395 .sht = &hpt36x_sht,
396   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
  396 + .flags = ATA_FLAG_SLAVE_POSS,
397 397 .pio_mask = 0x1f,
398 398 .mwdma_mask = 0x07,
399 399 .udma_mask = 0x1f,
drivers/ata/pata_hpt37x.c
Diff comments   View file @ 1d2808f
... ... @@ -889,7 +889,7 @@
889 889 /* HPT370 - UDMA100 */
890 890 static const struct ata_port_info info_hpt370 = {
891 891 .sht = &hpt37x_sht,
892   - .flags = ATA_FLAG_SLAVE_POSS|ATA_FLAG_SRST,
  892 + .flags = ATA_FLAG_SLAVE_POSS,
893 893 .pio_mask = 0x1f,
894 894 .mwdma_mask = 0x07,
895 895 .udma_mask = 0x3f,
... ... @@ -898,7 +898,7 @@
898 898 /* HPT370A - UDMA100 */
899 899 static const struct ata_port_info info_hpt370a = {
900 900 .sht = &hpt37x_sht,
901   - .flags = ATA_FLAG_SLAVE_POSS|ATA_FLAG_SRST,
  901 + .flags = ATA_FLAG_SLAVE_POSS,
902 902 .pio_mask = 0x1f,
903 903 .mwdma_mask = 0x07,
904 904 .udma_mask = 0x3f,
... ... @@ -907,7 +907,7 @@
907 907 /* HPT370 - UDMA100 */
908 908 static const struct ata_port_info info_hpt370_33 = {
909 909 .sht = &hpt37x_sht,
910   - .flags = ATA_FLAG_SLAVE_POSS|ATA_FLAG_SRST,
  910 + .flags = ATA_FLAG_SLAVE_POSS,
911 911 .pio_mask = 0x1f,
912 912 .mwdma_mask = 0x07,
913 913 .udma_mask = 0x0f,
... ... @@ -916,7 +916,7 @@
916 916 /* HPT370A - UDMA100 */
917 917 static const struct ata_port_info info_hpt370a_33 = {
918 918 .sht = &hpt37x_sht,
919   - .flags = ATA_FLAG_SLAVE_POSS|ATA_FLAG_SRST,
  919 + .flags = ATA_FLAG_SLAVE_POSS,
920 920 .pio_mask = 0x1f,
921 921 .mwdma_mask = 0x07,
922 922 .udma_mask = 0x0f,
... ... @@ -925,7 +925,7 @@
925 925 /* HPT371, 372 and friends - UDMA133 */
926 926 static const struct ata_port_info info_hpt372 = {
927 927 .sht = &hpt37x_sht,
928   - .flags = ATA_FLAG_SLAVE_POSS|ATA_FLAG_SRST,
  928 + .flags = ATA_FLAG_SLAVE_POSS,
929 929 .pio_mask = 0x1f,
930 930 .mwdma_mask = 0x07,
931 931 .udma_mask = 0x7f,
... ... @@ -934,7 +934,7 @@
934 934 /* HPT374 - UDMA100 */
935 935 static const struct ata_port_info info_hpt374 = {
936 936 .sht = &hpt37x_sht,
937   - .flags = ATA_FLAG_SLAVE_POSS|ATA_FLAG_SRST,
  937 + .flags = ATA_FLAG_SLAVE_POSS,
938 938 .pio_mask = 0x1f,
939 939 .mwdma_mask = 0x07,
940 940 .udma_mask = 0x3f,
drivers/ata/pata_hpt3x2n.c
Diff comments   View file @ 1d2808f
... ... @@ -490,7 +490,7 @@
490 490 /* HPT372N and friends - UDMA133 */
491 491 static const struct ata_port_info info = {
492 492 .sht = &hpt3x2n_sht,
493   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
  493 + .flags = ATA_FLAG_SLAVE_POSS,
494 494 .pio_mask = 0x1f,
495 495 .mwdma_mask = 0x07,
496 496 .udma_mask = 0x7f,
drivers/ata/pata_hpt3x3.c
Diff comments   View file @ 1d2808f
... ... @@ -173,7 +173,7 @@
173 173 {
174 174 static const struct ata_port_info info = {
175 175 .sht = &hpt3x3_sht,
176   - .flags = ATA_FLAG_SLAVE_POSS|ATA_FLAG_SRST,
  176 + .flags = ATA_FLAG_SLAVE_POSS,
177 177 .pio_mask = 0x1f,
178 178 .mwdma_mask = 0x07,
179 179 .udma_mask = 0x07,
drivers/ata/pata_icside.c
Diff comments   View file @ 1d2808f
... ... @@ -530,7 +530,7 @@
530 530  
531 531 ap->pio_mask = 0x1f;
532 532 ap->mwdma_mask = info->mwdma_mask;
533   - ap->flags |= ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST;
  533 + ap->flags |= ATA_FLAG_SLAVE_POSS;
534 534 ap->ops = &pata_icside_port_ops;
535 535  
536 536 pata_icside_setup_ioaddr(&ap->ioaddr, info->base, info->port[i]);
drivers/ata/pata_it8213.c
Diff comments   View file @ 1d2808f
... ... @@ -313,7 +313,7 @@
313 313 static int printed_version;
314 314 static const struct ata_port_info info = {
315 315 .sht = &it8213_sht,
316   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
  316 + .flags = ATA_FLAG_SLAVE_POSS,
317 317 .pio_mask = 0x1f, /* pio0-4 */
318 318 .mwdma_mask = 0x07, /* mwdma0-2 */
319 319 .udma_mask = 0x1f, /* UDMA 100 */
drivers/ata/pata_it821x.c
Diff comments   View file @ 1d2808f
... ... @@ -714,14 +714,14 @@
714 714  
715 715 static const struct ata_port_info info_smart = {
716 716 .sht = &it821x_sht,
717   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
  717 + .flags = ATA_FLAG_SLAVE_POSS,
718 718 .pio_mask = 0x1f,
719 719 .mwdma_mask = 0x07,
720 720 .port_ops = &it821x_smart_port_ops
721 721 };
722 722 static const struct ata_port_info info_passthru = {
723 723 .sht = &it821x_sht,
724   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
  724 + .flags = ATA_FLAG_SLAVE_POSS,
725 725 .pio_mask = 0x1f,
726 726 .mwdma_mask = 0x07,
727 727 .udma_mask = 0x7f,
drivers/ata/pata_jmicron.c
Diff comments   View file @ 1d2808f
... ... @@ -193,7 +193,7 @@
193 193 {
194 194 static const struct ata_port_info info = {
195 195 .sht = &jmicron_sht,
196   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
  196 + .flags = ATA_FLAG_SLAVE_POSS,
197 197  
198 198 .pio_mask = 0x1f,
199 199 .mwdma_mask = 0x07,
drivers/ata/pata_marvell.c
Diff comments   View file @ 1d2808f
... ... @@ -163,7 +163,7 @@
163 163 {
164 164 static const struct ata_port_info info = {
165 165 .sht = &marvell_sht,
166   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
  166 + .flags = ATA_FLAG_SLAVE_POSS,
167 167  
168 168 .pio_mask = 0x1f,
169 169 .mwdma_mask = 0x07,
... ... @@ -174,7 +174,7 @@
174 174 static const struct ata_port_info info_sata = {
175 175 .sht = &marvell_sht,
176 176 /* Slave possible as its magically mapped not real */
177   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
  177 + .flags = ATA_FLAG_SLAVE_POSS,
178 178  
179 179 .pio_mask = 0x1f,
180 180 .mwdma_mask = 0x07,
drivers/ata/pata_netcell.c
Diff comments   View file @ 1d2808f
... ... @@ -94,7 +94,7 @@
94 94 static int printed_version;
95 95 static const struct ata_port_info info = {
96 96 .sht = &netcell_sht,
97   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
  97 + .flags = ATA_FLAG_SLAVE_POSS,
98 98 /* Actually we don't really care about these as the
99 99 firmware deals with it */
100 100 .pio_mask = 0x1f, /* pio0-4 */
drivers/ata/pata_ns87410.c
Diff comments   View file @ 1d2808f
... ... @@ -193,7 +193,7 @@
193 193 {
194 194 static const struct ata_port_info info = {
195 195 .sht = &ns87410_sht,
196   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
  196 + .flags = ATA_FLAG_SLAVE_POSS,
197 197 .pio_mask = 0x0F,
198 198 .port_ops = &ns87410_port_ops
199 199 };
drivers/ata/pata_oldpiix.c
Diff comments   View file @ 1d2808f
... ... @@ -291,7 +291,7 @@
291 291 static int printed_version;
292 292 static const struct ata_port_info info = {
293 293 .sht = &oldpiix_sht,
294   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
  294 + .flags = ATA_FLAG_SLAVE_POSS,
295 295 .pio_mask = 0x1f, /* pio0-4 */
296 296 .mwdma_mask = 0x07, /* mwdma1-2 */
297 297 .port_ops = &oldpiix_pata_ops,
drivers/ata/pata_opti.c
Diff comments   View file @ 1d2808f
... ... @@ -218,7 +218,7 @@
218 218 {
219 219 static const struct ata_port_info info = {
220 220 .sht = &opti_sht,
221   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
  221 + .flags = ATA_FLAG_SLAVE_POSS,
222 222 .pio_mask = 0x1f,
223 223 .port_ops = &opti_port_ops
224 224 };
drivers/ata/pata_optidma.c
Diff comments   View file @ 1d2808f
... ... @@ -484,14 +484,14 @@
484 484 {
485 485 static const struct ata_port_info info_82c700 = {
486 486 .sht = &optidma_sht,
487   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
  487 + .flags = ATA_FLAG_SLAVE_POSS,
488 488 .pio_mask = 0x1f,
489 489 .mwdma_mask = 0x07,
490 490 .port_ops = &optidma_port_ops
491 491 };
492 492 static const struct ata_port_info info_82c700_udma = {
493 493 .sht = &optidma_sht,
494   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
  494 + .flags = ATA_FLAG_SLAVE_POSS,
495 495 .pio_mask = 0x1f,
496 496 .mwdma_mask = 0x07,
497 497 .udma_mask = 0x07,
drivers/ata/pata_pdc202xx_old.c
Diff comments   View file @ 1d2808f
... ... @@ -320,7 +320,7 @@
320 320 static const struct ata_port_info info[3] = {
321 321 {
322 322 .sht = &pdc202xx_sht,
323   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
  323 + .flags = ATA_FLAG_SLAVE_POSS,
324 324 .pio_mask = 0x1f,
325 325 .mwdma_mask = 0x07,
326 326 .udma_mask = ATA_UDMA2,
... ... @@ -328,7 +328,7 @@
328 328 },
329 329 {
330 330 .sht = &pdc202xx_sht,
331   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
  331 + .flags = ATA_FLAG_SLAVE_POSS,
332 332 .pio_mask = 0x1f,
333 333 .mwdma_mask = 0x07,
334 334 .udma_mask = ATA_UDMA4,
... ... @@ -336,7 +336,7 @@
336 336 },
337 337 {
338 338 .sht = &pdc202xx_sht,
339   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
  339 + .flags = ATA_FLAG_SLAVE_POSS,
340 340 .pio_mask = 0x1f,
341 341 .mwdma_mask = 0x07,
342 342 .udma_mask = ATA_UDMA5,
drivers/ata/pata_radisys.c
Diff comments   View file @ 1d2808f
... ... @@ -257,7 +257,7 @@
257 257 static int printed_version;
258 258 static const struct ata_port_info info = {
259 259 .sht = &radisys_sht,
260   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
  260 + .flags = ATA_FLAG_SLAVE_POSS,
261 261 .pio_mask = 0x1f, /* pio0-4 */
262 262 .mwdma_mask = 0x07, /* mwdma1-2 */
263 263 .udma_mask = 0x14, /* UDMA33/66 only */
drivers/ata/pata_rz1000.c
Diff comments   View file @ 1d2808f
... ... @@ -133,7 +133,7 @@
133 133 static int printed_version;
134 134 static const struct ata_port_info info = {
135 135 .sht = &rz1000_sht,
136   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
  136 + .flags = ATA_FLAG_SLAVE_POSS,
137 137 .pio_mask = 0x1f,
138 138 .port_ops = &rz1000_port_ops
139 139 };
drivers/ata/pata_sc1200.c
Diff comments   View file @ 1d2808f
... ... @@ -245,7 +245,7 @@
245 245 {
246 246 static const struct ata_port_info info = {
247 247 .sht = &sc1200_sht,
248   - .flags = ATA_FLAG_SLAVE_POSS|ATA_FLAG_SRST,
  248 + .flags = ATA_FLAG_SLAVE_POSS,
249 249 .pio_mask = 0x1f,
250 250 .mwdma_mask = 0x07,
251 251 .udma_mask = 0x07,
drivers/ata/pata_serverworks.c
Diff comments   View file @ 1d2808f
... ... @@ -478,28 +478,28 @@
478 478 static const struct ata_port_info info[4] = {
479 479 { /* OSB4 */
480 480 .sht = &serverworks_sht,
481   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
  481 + .flags = ATA_FLAG_SLAVE_POSS,
482 482 .pio_mask = 0x1f,
483 483 .mwdma_mask = 0x07,
484 484 .udma_mask = 0x07,
485 485 .port_ops = &serverworks_osb4_port_ops
486 486 }, { /* OSB4 no UDMA */
487 487 .sht = &serverworks_sht,
488   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
  488 + .flags = ATA_FLAG_SLAVE_POSS,
489 489 .pio_mask = 0x1f,
490 490 .mwdma_mask = 0x07,
491 491 .udma_mask = 0x00,
492 492 .port_ops = &serverworks_osb4_port_ops
493 493 }, { /* CSB5 */
494 494 .sht = &serverworks_sht,
495   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
  495 + .flags = ATA_FLAG_SLAVE_POSS,
496 496 .pio_mask = 0x1f,
497 497 .mwdma_mask = 0x07,
498 498 .udma_mask = 0x1f,
499 499 .port_ops = &serverworks_csb_port_ops
500 500 }, { /* CSB5 - later revisions*/
501 501 .sht = &serverworks_sht,
502   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
  502 + .flags = ATA_FLAG_SLAVE_POSS,
503 503 .pio_mask = 0x1f,
504 504 .mwdma_mask = 0x07,
505 505 .udma_mask = 0x3f,
drivers/ata/pata_sil680.c
Diff comments   View file @ 1d2808f
... ... @@ -343,7 +343,7 @@
343 343 {
344 344 static const struct ata_port_info info = {
345 345 .sht = &sil680_sht,
346   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
  346 + .flags = ATA_FLAG_SLAVE_POSS,
347 347 .pio_mask = 0x1f,
348 348 .mwdma_mask = 0x07,
349 349 .udma_mask = 0x7f,
... ... @@ -351,7 +351,7 @@
351 351 };
352 352 static const struct ata_port_info info_slow = {
353 353 .sht = &sil680_sht,
354   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
  354 + .flags = ATA_FLAG_SLAVE_POSS,
355 355 .pio_mask = 0x1f,
356 356 .mwdma_mask = 0x07,
357 357 .udma_mask = 0x3f,
drivers/ata/pata_sis.c
Diff comments   View file @ 1d2808f
... ... @@ -732,7 +732,7 @@
732 732  
733 733 static const struct ata_port_info sis_info = {
734 734 .sht = &sis_sht,
735   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
  735 + .flags = ATA_FLAG_SLAVE_POSS,
736 736 .pio_mask = 0x1f, /* pio0-4 */
737 737 .mwdma_mask = 0x07,
738 738 .udma_mask = 0,
... ... @@ -740,7 +740,7 @@
740 740 };
741 741 static const struct ata_port_info sis_info33 = {
742 742 .sht = &sis_sht,
743   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
  743 + .flags = ATA_FLAG_SLAVE_POSS,
744 744 .pio_mask = 0x1f, /* pio0-4 */
745 745 .mwdma_mask = 0x07,
746 746 .udma_mask = ATA_UDMA2, /* UDMA 33 */
747 747  
748 748  
749 749  
... ... @@ -748,28 +748,28 @@
748 748 };
749 749 static const struct ata_port_info sis_info66 = {
750 750 .sht = &sis_sht,
751   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
  751 + .flags = ATA_FLAG_SLAVE_POSS,
752 752 .pio_mask = 0x1f, /* pio0-4 */
753 753 .udma_mask = ATA_UDMA4, /* UDMA 66 */
754 754 .port_ops = &sis_66_ops,
755 755 };
756 756 static const struct ata_port_info sis_info100 = {
757 757 .sht = &sis_sht,
758   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
  758 + .flags = ATA_FLAG_SLAVE_POSS,
759 759 .pio_mask = 0x1f, /* pio0-4 */
760 760 .udma_mask = ATA_UDMA5,
761 761 .port_ops = &sis_100_ops,
762 762 };
763 763 static const struct ata_port_info sis_info100_early = {
764 764 .sht = &sis_sht,
765   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
  765 + .flags = ATA_FLAG_SLAVE_POSS,
766 766 .udma_mask = ATA_UDMA5,
767 767 .pio_mask = 0x1f, /* pio0-4 */
768 768 .port_ops = &sis_66_ops,
769 769 };
770 770 static const struct ata_port_info sis_info133 = {
771 771 .sht = &sis_sht,
772   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
  772 + .flags = ATA_FLAG_SLAVE_POSS,
773 773 .pio_mask = 0x1f, /* pio0-4 */
774 774 .udma_mask = ATA_UDMA6,
775 775 .port_ops = &sis_133_ops,
... ... @@ -783,7 +783,7 @@
783 783 };
784 784 static const struct ata_port_info sis_info133_early = {
785 785 .sht = &sis_sht,
786   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
  786 + .flags = ATA_FLAG_SLAVE_POSS,
787 787 .pio_mask = 0x1f, /* pio0-4 */
788 788 .udma_mask = ATA_UDMA6,
789 789 .port_ops = &sis_133_early_ops,
drivers/ata/pata_sl82c105.c
Diff comments   View file @ 1d2808f
... ... @@ -303,14 +303,14 @@
303 303 {
304 304 static const struct ata_port_info info_dma = {
305 305 .sht = &sl82c105_sht,
306   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
  306 + .flags = ATA_FLAG_SLAVE_POSS,
307 307 .pio_mask = 0x1f,
308 308 .mwdma_mask = 0x07,
309 309 .port_ops = &sl82c105_port_ops
310 310 };
311 311 static const struct ata_port_info info_early = {
312 312 .sht = &sl82c105_sht,
313   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
  313 + .flags = ATA_FLAG_SLAVE_POSS,
314 314 .pio_mask = 0x1f,
315 315 .port_ops = &sl82c105_port_ops
316 316 };
drivers/ata/pata_triflex.c
Diff comments   View file @ 1d2808f
... ... @@ -235,7 +235,7 @@
235 235 {
236 236 static const struct ata_port_info info = {
237 237 .sht = &triflex_sht,
238   - .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
  238 + .flags = ATA_FLAG_SLAVE_POSS,
239 239 .pio_mask = 0x1f,
240 240 .mwdma_mask = 0x07,
241 241 .port_ops = &triflex_port_ops