On 12/13/18 11:47 AM, Hannes Reinecke wrote:
> ATA_DEBUG is now only used to switch on additional message levels.
> So move those two levels (ATA_MSG_INFO and ATA_MSG_CTL) over to
> ata_XXX_dbg() and remove the remaining references to ATA_DEBUG.
>
> Signed-off-by: Hannes Reinecke <hare@xxxxxxxx>
Reviewed-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@xxxxxxxxxxx>
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics
> ---
> drivers/ata/libata-core.c | 6 ++----
> drivers/ata/libata-sff.c | 3 +--
> include/linux/libata.h | 11 ++---------
> 3 files changed, 5 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
> index 914520254215..598b92d24530 100644
> --- a/drivers/ata/libata-core.c
> +++ b/drivers/ata/libata-core.c
> @@ -2464,8 +2464,8 @@ int ata_dev_configure(struct ata_device *dev)
> char modelbuf[ATA_ID_PROD_LEN+1];
> int rc;
>
> - if (!ata_dev_enabled(dev) && ata_msg_info(ap)) {
> - ata_dev_info(dev, "%s: ENTER/EXIT -- nodev\n", __func__);
> + if (!ata_dev_enabled(dev)) {
> + ata_dev_dbg(dev, "%s: ENTER/EXIT -- nodev\n", __func__);
> return 0;
> }
>
> @@ -6025,8 +6025,6 @@ struct ata_port *ata_port_alloc(struct ata_host *host)
> #if defined(ATA_VERBOSE_DEBUG)
> /* turn on all debugging levels */
> ap->msg_enable = 0x00FF;
> -#elif defined(ATA_DEBUG)
> - ap->msg_enable = ATA_MSG_DRV | ATA_MSG_INFO | ATA_MSG_CTL | ATA_MSG_WARN | ATA_MSG_ERR;
> #else
> ap->msg_enable = ATA_MSG_DRV | ATA_MSG_ERR | ATA_MSG_WARN;
> #endif
> diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c
> index 48b27f4e52fe..6587ae4fe0f4 100644
> --- a/drivers/ata/libata-sff.c
> +++ b/drivers/ata/libata-sff.c
> @@ -1277,8 +1277,7 @@ void ata_sff_flush_pio_task(struct ata_port *ap)
>
> ap->sff_pio_task_link = NULL;
>
> - if (ata_msg_ctl(ap))
> - ata_port_dbg(ap, "%s: EXIT\n", __func__);
> + ata_port_dbg(ap, "%s: EXIT\n", __func__);
> }
>
> static void ata_sff_pio_task(struct work_struct *work)
> diff --git a/include/linux/libata.h b/include/linux/libata.h
> index cf62f3bdf4ef..4b5b174994b5 100644
> --- a/include/linux/libata.h
> +++ b/include/linux/libata.h
> @@ -54,22 +54,17 @@
> * compile-time options: to be removed as soon as all the drivers are
> * converted to the new debugging mechanism
> */
> -#undef ATA_DEBUG /* debugging output */
> #undef ATA_VERBOSE_DEBUG /* yet more debugging output */
> #undef ATA_IRQ_TRAP /* define to ack screaming irqs */
> #undef ATA_NDEBUG /* define to disable quick runtime checks */
>
>
> /* note: prints function name for you */
> -#ifdef ATA_DEBUG
> #ifdef ATA_VERBOSE_DEBUG
> #define VPRINTK(fmt, args...) printk(KERN_ERR "%s: " fmt, __func__, ## args)
> #else
> #define VPRINTK(fmt, args...)
> #endif /* ATA_VERBOSE_DEBUG */
> -#else
> -#define VPRINTK(fmt, args...)
> -#endif /* ATA_DEBUG */
>
> #define BPRINTK(fmt, args...) if (ap->flags & ATA_FLAG_DEBUGMSG) printk(KERN_ERR "%s: " fmt, __func__, ## args)
>
> @@ -1979,11 +1974,9 @@ static inline u8 ata_wait_idle(struct ata_port *ap)
> {
> u8 status = ata_sff_busy_wait(ap, ATA_BUSY | ATA_DRQ, 1000);
>
> -#ifdef ATA_DEBUG
> if (status != 0xff && (status & (ATA_BUSY | ATA_DRQ)))
> - ata_port_printk(ap, KERN_DEBUG, "abnormal Status 0x%X\n",
> - status);
> -#endif
> + ata_port_dbg(ap, "%s: abnormal Status 0x%X\n",
> + __func__, status);
>
> return status;
> }
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics
