On 2/4/20 5:55 PM, Hannes Reinecke wrote:
> From: Hannes Reinecke <hare@xxxxxxxx>
>
> All instances had been converted to ata_XXX_dbg() anyway, so
> the conditional is pointless anyway.
>
> Signed-off-by: Hannes Reinecke <hare@xxxxxxx>
Reviewed-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@xxxxxxxxxxx>
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics
> ---
> drivers/ata/libata-core.c | 5 ++---
> include/linux/libata.h | 2 --
> 2 files changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
> index a81e7006e73f..0f1682a55b54 100644
> --- a/drivers/ata/libata-core.c
> +++ b/drivers/ata/libata-core.c
> @@ -1858,8 +1858,7 @@ int ata_dev_read_id(struct ata_device *dev, unsigned int *p_class,
> int may_fallback = 1, tried_spinup = 0;
> int rc;
>
> - if (ata_msg_ctl(ap))
> - ata_dev_dbg(dev, "%s: ENTER\n", __func__);
> + ata_dev_dbg(dev, "ENTER\n");
>
> retry:
> ata_tf_init(dev, &tf);
> @@ -6036,7 +6035,7 @@ struct ata_port *ata_port_alloc(struct ata_host *host)
> /* turn on all debugging levels */
> ap->msg_enable = 0x00FF;
> #elif defined(ATA_DEBUG)
> - ap->msg_enable = ATA_MSG_DRV | ATA_MSG_CTL | ATA_MSG_WARN | ATA_MSG_ERR;
> + ap->msg_enable = ATA_MSG_DRV | ATA_MSG_WARN | ATA_MSG_ERR;
> #else
> ap->msg_enable = ATA_MSG_DRV | ATA_MSG_ERR | ATA_MSG_WARN;
> #endif
> diff --git a/include/linux/libata.h b/include/linux/libata.h
> index cab7aa3f0ed0..1012aed05187 100644
> --- a/include/linux/libata.h
> +++ b/include/linux/libata.h
> @@ -73,7 +73,6 @@ enum {
> ATA_MSG_PROBE = 0x0004,
> ATA_MSG_WARN = 0x0008,
> ATA_MSG_MALLOC = 0x0010,
> - ATA_MSG_CTL = 0x0020,
> ATA_MSG_INTR = 0x0040,
> ATA_MSG_ERR = 0x0080,
> };
> @@ -82,7 +81,6 @@ enum {
> #define ata_msg_probe(p) ((p)->msg_enable & ATA_MSG_PROBE)
> #define ata_msg_warn(p) ((p)->msg_enable & ATA_MSG_WARN)
> #define ata_msg_malloc(p) ((p)->msg_enable & ATA_MSG_MALLOC)
> -#define ata_msg_ctl(p) ((p)->msg_enable & ATA_MSG_CTL)
> #define ata_msg_intr(p) ((p)->msg_enable & ATA_MSG_INTR)
> #define ata_msg_err(p) ((p)->msg_enable & ATA_MSG_ERR)
>
