On Tue, 08 Apr 2025, Lucas De Marchi <[email protected]> wrote: > This reverts commit 3f412047c54e28ecd50c10bdcec698f166c861e8. > > Tentative removal from topic/core-for-CI. > > Signed-off-by: Lucas De Marchi <[email protected]>
Acked-by: Jani Nikula <[email protected]> > --- > drivers/ata/libata-core.c | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c > index 14bed90d83367..773799cfd4430 100644 > --- a/drivers/ata/libata-core.c > +++ b/drivers/ata/libata-core.c > @@ -2178,7 +2178,7 @@ static bool ata_identify_page_supported(struct > ata_device *dev, u8 page) > * for drives which implement this ATA level or above. > */ > if (ata_id_major_version(dev->id) >= 10) > - ata_dev_notice(dev, > + ata_dev_warn(dev, > "ATA Identify Device Log not supported\n"); > dev->quirks |= ATA_QUIRK_NO_ID_DEV_LOG; > return false; > @@ -2249,7 +2249,7 @@ static void ata_dev_config_ncq_send_recv(struct > ata_device *dev) > unsigned int err_mask; > > if (!ata_log_supported(dev, ATA_LOG_NCQ_SEND_RECV)) { > - ata_dev_notice(dev, "NCQ Send/Recv Log not supported\n"); > + ata_dev_warn(dev, "NCQ Send/Recv Log not supported\n"); > return; > } > err_mask = ata_read_log_page(dev, ATA_LOG_NCQ_SEND_RECV, > @@ -2273,8 +2273,8 @@ static void ata_dev_config_ncq_non_data(struct > ata_device *dev) > unsigned int err_mask; > > if (!ata_log_supported(dev, ATA_LOG_NCQ_NON_DATA)) { > - ata_dev_notice(dev, > - "NCQ Non-Data Log not supported\n"); > + ata_dev_warn(dev, > + "NCQ Non-Data Log not supported\n"); > return; > } > err_mask = ata_read_log_page(dev, ATA_LOG_NCQ_NON_DATA, > @@ -2937,14 +2937,14 @@ int ata_dev_configure(struct ata_device *dev) > if (ata_id_is_cfa(id)) { > /* CPRM may make this media unusable */ > if (id[ATA_ID_CFA_KEY_MGMT] & 1) > - ata_dev_notice(dev, > + ata_dev_warn(dev, > "supports DRM functions and may not be fully accessible\n"); > snprintf(revbuf, 7, "CFA"); > } else { > snprintf(revbuf, 7, "ATA-%d", ata_id_major_version(id)); > /* Warn the user if the device has TPM extensions */ > if (ata_id_has_tpm(id)) > - ata_dev_notice(dev, > + ata_dev_warn(dev, > "supports DRM functions and may not be fully accessible\n"); > } > > @@ -3100,8 +3100,8 @@ int ata_dev_configure(struct ata_device *dev) > } > > if ((dev->quirks & ATA_QUIRK_FIRMWARE_WARN) && print_info) { > - ata_dev_notice(dev, "WARNING: device requires firmware update > to be fully functional\n"); > - ata_dev_notice(dev, " contact the vendor or visit > http://ata.wiki.kernel.org\n";); > + ata_dev_warn(dev, "WARNING: device requires firmware update to > be fully functional\n"); > + ata_dev_warn(dev, " contact the vendor or visit > http://ata.wiki.kernel.org\n";); > } > > return 0; -- Jani Nikula, Intel
