[openwrt/openwrt] oxnas: sata_oxnas: use ata_link_err

LEDE Commits lede-commits at lists.infradead.org
Tue Jan 3 14:56:57 PST 2023


hauke pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/a80e6301313539a37cc942680500fc9bce5880c3

commit a80e6301313539a37cc942680500fc9bce5880c3
Author: Robert Marko <robimarko at gmail.com>
AuthorDate: Sun Jan 1 14:24:06 2023 +0100

    oxnas: sata_oxnas: use ata_link_err
    
    Kernel 5.15.86 has backported ("ata: libata: move ata_{port,link,dev}_dbg
    to standard pr_XXX() macros") and this is now causing compilation errors
    for oxnas SATA driver due to usage of ata_link_printk().
    
    Upstream has migrated to using the appropriate
    ata_link_{err, warn, notice, info} calls a while ago so its not affected.
    
    Lets do the same for oxnas SATA driver and use ata_link_err() instead of
    ata_link_printk().
    
    Signed-off-by: Robert Marko <robimarko at gmail.com>
---
 target/linux/oxnas/files/drivers/ata/sata_oxnas.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target/linux/oxnas/files/drivers/ata/sata_oxnas.c b/target/linux/oxnas/files/drivers/ata/sata_oxnas.c
index 217c258565..bd39ce7b1b 100644
--- a/target/linux/oxnas/files/drivers/ata/sata_oxnas.c
+++ b/target/linux/oxnas/files/drivers/ata/sata_oxnas.c
@@ -2039,7 +2039,7 @@ static int sata_oxnas_softreset(struct ata_link *link, unsigned int *class,
 
 	/* if link is occupied, -ENODEV too is an error */
 	if (rc && (rc != -ENODEV || sata_scr_valid(link))) {
-		ata_link_printk(link, KERN_ERR, "SRST failed (errno=%d)\n", rc);
+		ata_link_err(link, "SRST failed (errno=%d)\n", rc);
 		return rc;
 	}
 




More information about the lede-commits mailing list