All callsites have been converted to dynamic debugging.
Unified · Split
| @@ -402,7 +402,6 @@ EXPORT_SYMBOL_GPL(ata_acpi_stm); · 401 unmodified lines | ||
| 402 | 402 | */ |
| 403 | 403 | static int ata_dev_get_GTF(struct ata_device *dev, struct ata_acpi_gtf **gtf) |
| 404 | 404 | { |
| 405 | − struct ata_port *ap = dev->link->ap; | |
| 406 | 405 | acpi_status status; |
| 407 | 406 | struct acpi_buffer output; |
| 408 | 407 | union acpi_object *out_obj; |
| @@ -418,10 +417,6 @@ static int ata_dev_get_GTF(struct ata_device *dev, struct ata_acpi_gtf **gtf) · 9 unmodified lines | ||
| 418 | 417 | output.length = ACPI_ALLOCATE_BUFFER; |
| 419 | 418 | output.pointer = NULL; /* ACPI-CA sets this; save/free it later */ |
| 420 | 419 | |
| 421 | − if (ata_msg_probe(ap)) | |
| 422 | − ata_dev_dbg(dev, "%s: ENTER: port#: %d\n", | |
| 423 | − __func__, ap->port_no); | |
| 424 | − | |
| 425 | 420 | /* _GTF has no input parameters */ |
| 426 | 421 | status = acpi_evaluate_object(ata_dev_acpi_handle(dev), "_GTF", NULL, |
| 427 | 422 | &output); |
| @@ -437,11 +432,9 @@ static int ata_dev_get_GTF(struct ata_device *dev, struct ata_acpi_gtf **gtf) · 9 unmodified lines | ||
| 437 | 432 | } |
| 438 | 433 | |
| 439 | 434 | if (!output.length || !output.pointer) { |
| 440 | − if (ata_msg_probe(ap)) | |
| 441 | − ata_dev_dbg(dev, "%s: Run _GTF: length or ptr is NULL (0x%llx, 0x%p)\n", | |
| 442 | − __func__, | |
| 443 | − (unsigned long long)output.length, | |
| 444 | − output.pointer); | |
| 435 | + ata_dev_dbg(dev, "Run _GTF: length or ptr is NULL (0x%llx, 0x%p)\n", | |
| 436 | + (unsigned long long)output.length, | |
| 437 | + output.pointer); | |
| 445 | 438 | rc = -EINVAL; |
| 446 | 439 | goto out_free; |
| 447 | 440 | } |
| @@ -464,9 +457,8 @@ static int ata_dev_get_GTF(struct ata_device *dev, struct ata_acpi_gtf **gtf) · 16 unmodified lines | ||
| 464 | 457 | rc = out_obj->buffer.length / REGS_PER_GTF; |
| 465 | 458 | if (gtf) { |
| 466 | 459 | *gtf = (void *)out_obj->buffer.pointer; |
| 467 | − if (ata_msg_probe(ap)) | |
| 468 | − ata_dev_dbg(dev, "%s: returning gtf=%p, gtf_count=%d\n", | |
| 469 | − __func__, *gtf, rc); | |
| 460 | + ata_dev_dbg(dev, "returning gtf=%p, gtf_count=%d\n", | |
| 461 | + *gtf, rc); | |
| 470 | 462 | } |
| 471 | 463 | return rc; |
| 472 | 464 | |
| @@ -778,9 +770,8 @@ static int ata_acpi_push_id(struct ata_device *dev) · 305 unmodified lines | ||
| 778 | 770 | struct acpi_object_list input; |
| 779 | 771 | union acpi_object in_params[1]; |
| 780 | 772 | |
| 781 | − if (ata_msg_probe(ap)) | |
| 782 | − ata_dev_dbg(dev, "%s: ix = %d, port#: %d\n", | |
| 783 | − __func__, dev->devno, ap->port_no); | |
| 773 | + ata_dev_dbg(dev, "%s: ix = %d, port#: %d\n", | |
| 774 | + __func__, dev->devno, ap->port_no); | |
| 784 | 775 | |
| 785 | 776 | /* Give the drive Identify data to the drive via the _SDD method */ |
| 786 | 777 | /* _SDD: set up input parameters */ |
| @@ -2535,9 +2535,6 @@ int ata_dev_configure(struct ata_device *dev) · 2534 unmodified lines | ||
| 2535 | 2535 | return 0; |
| 2536 | 2536 | } |
| 2537 | 2537 | |
| 2538 | − if (ata_msg_probe(ap)) | |
| 2539 | − ata_dev_dbg(dev, "%s: ENTER\n", __func__); | |
| 2540 | − | |
| 2541 | 2538 | /* set horkage */ |
| 2542 | 2539 | dev->horkage |= ata_dev_blacklisted(dev); |
| 2543 | 2540 | ata_force_horkage(dev); |
| @@ -2585,13 +2582,12 @@ int ata_dev_configure(struct ata_device *dev) · 41 unmodified lines | ||
| 2585 | 2582 | return rc; |
| 2586 | 2583 | |
| 2587 | 2584 | /* print device capabilities */ |
| 2588 | − if (ata_msg_probe(ap)) | |
| 2589 | − ata_dev_dbg(dev, | |
| 2590 | − "%s: cfg 49:%04x 82:%04x 83:%04x 84:%04x " | |
| 2591 | − "85:%04x 86:%04x 87:%04x 88:%04x\n", | |
| 2592 | − __func__, | |
| 2593 | − id[49], id[82], id[83], id[84], | |
| 2594 | − id[85], id[86], id[87], id[88]); | |
| 2585 | + ata_dev_dbg(dev, | |
| 2586 | + "%s: cfg 49:%04x 82:%04x 83:%04x 84:%04x " | |
| 2587 | + "85:%04x 86:%04x 87:%04x 88:%04x\n", | |
| 2588 | + __func__, | |
| 2589 | + id[49], id[82], id[83], id[84], | |
| 2590 | + id[85], id[86], id[87], id[88]); | |
| 2595 | 2591 | |
| 2596 | 2592 | /* initialize to-be-configured parameters */ |
| 2597 | 2593 | dev->flags &= ~ATA_DFLAG_CFG_MASK; |
| @@ -2791,8 +2787,6 @@ int ata_dev_configure(struct ata_device *dev) · 193 unmodified lines | ||
| 2791 | 2787 | return 0; |
| 2792 | 2788 | |
| 2793 | 2789 | err_out_nosup: |
| 2794 | − if (ata_msg_probe(ap)) | |
| 2795 | − ata_dev_dbg(dev, "%s: EXIT, err\n", __func__); | |
| 2796 | 2790 | return rc; |
| 2797 | 2791 | } |
| 2798 | 2792 | |
| @@ -5339,7 +5333,7 @@ struct ata_port *ata_port_alloc(struct ata_host *host) · 2540 unmodified lines | ||
| 5339 | 5333 | |
| 5340 | 5334 | #if defined(ATA_VERBOSE_DEBUG) |
| 5341 | 5335 | /* turn on all debugging levels */ |
| 5342 | − ap->msg_enable = 0x0007; | |
| 5336 | + ap->msg_enable = 0x0003; | |
| 5343 | 5337 | #elif defined(ATA_DEBUG) |
| 5344 | 5338 | ap->msg_enable = ATA_MSG_DRV | ATA_MSG_INFO; |
| 5345 | 5339 | #else |
| @@ -330,10 +330,6 @@ EXPORT_SYMBOL_GPL(ata_sff_dev_select); · 329 unmodified lines | ||
| 330 | 330 | static void ata_dev_select(struct ata_port *ap, unsigned int device, |
| 331 | 331 | unsigned int wait, unsigned int can_sleep) |
| 332 | 332 | { |
| 333 | − if (ata_msg_probe(ap)) | |
| 334 | − ata_port_info(ap, "ata_dev_select: ENTER, device %u, wait %u\n", | |
| 335 | − device, wait); | |
| 336 | − | |
| 337 | 333 | if (wait) |
| 338 | 334 | ata_wait_idle(ap); |
| 339 | 335 | |
| @@ -74,12 +74,10 @@ · 73 unmodified lines | ||
| 74 | 74 | enum { |
| 75 | 75 | ATA_MSG_DRV = 0x0001, |
| 76 | 76 | ATA_MSG_INFO = 0x0002, |
| 77 | − ATA_MSG_PROBE = 0x0004, | |
| 78 | 77 | }; |
| 79 | 78 | |
| 80 | 79 | #define ata_msg_drv(p) ((p)->msg_enable & ATA_MSG_DRV) |
| 81 | 80 | #define ata_msg_info(p) ((p)->msg_enable & ATA_MSG_INFO) |
| 82 | −#define ata_msg_probe(p) ((p)->msg_enable & ATA_MSG_PROBE) | |
| 83 | 81 | |
| 84 | 82 | static inline u32 ata_msg_init(int dval, int default_msg_enable_bits) |
| 85 | 83 | { |