Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ata: pata_hpt37x: convert pr_XXX() calls

Convert pr_XXX() calls to structured logging.

Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>

authored by

Hannes Reinecke and committed by
Damien Le Moal
f06c13aa f76ba003

+10 -10
+10 -10
drivers/ata/pata_hpt37x.c
··· 14 14 * TODO 15 15 * Look into engine reset on timeout errors. Should not be required. 16 16 */ 17 - 18 - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt 19 - 20 17 #include <linux/kernel.h> 21 18 #include <linux/module.h> 22 19 #include <linux/pci.h> ··· 228 231 229 232 i = match_string(list, -1, model_num); 230 233 if (i >= 0) { 231 - pr_warn("%s is not supported for %s\n", modestr, list[i]); 234 + ata_dev_warn(dev, "%s is not supported for %s\n", 235 + modestr, list[i]); 232 236 return 1; 233 237 } 234 238 return 0; ··· 862 864 chip_table = &hpt372; 863 865 break; 864 866 default: 865 - pr_err("Unknown HPT366 subtype, please report (%d)\n", 867 + dev_err(&dev->dev, 868 + "Unknown HPT366 subtype, please report (%d)\n", 866 869 rev); 867 870 return -ENODEV; 868 871 } ··· 904 905 *ppi = &info_hpt374_fn1; 905 906 break; 906 907 default: 907 - pr_err("PCI table is bogus, please report (%d)\n", dev->device); 908 + dev_err(&dev->dev, "PCI table is bogus, please report (%d)\n", 909 + dev->device); 908 910 return -ENODEV; 909 911 } 910 912 /* Ok so this is a chip we support */ ··· 953 953 u8 sr; 954 954 u32 total = 0; 955 955 956 - pr_warn("BIOS has not set timing clocks\n"); 956 + dev_warn(&dev->dev, "BIOS has not set timing clocks\n"); 957 957 958 958 /* This is the process the HPT371 BIOS is reported to use */ 959 959 for (i = 0; i < 128; i++) { ··· 1009 1009 (f_high << 16) | f_low | 0x100); 1010 1010 } 1011 1011 if (adjust == 8) { 1012 - pr_err("DPLL did not stabilize!\n"); 1012 + dev_err(&dev->dev, "DPLL did not stabilize!\n"); 1013 1013 return -ENODEV; 1014 1014 } 1015 1015 if (dpll == 3) ··· 1017 1017 else 1018 1018 private_data = (void *)hpt37x_timings_50; 1019 1019 1020 - pr_info("bus clock %dMHz, using %dMHz DPLL\n", 1020 + dev_info(&dev->dev, "bus clock %dMHz, using %dMHz DPLL\n", 1021 1021 MHz[clock_slot], MHz[dpll]); 1022 1022 } else { 1023 1023 private_data = (void *)chip_table->clocks[clock_slot]; ··· 1032 1032 if (clock_slot < 2 && ppi[0] == &info_hpt370a) 1033 1033 ppi[0] = &info_hpt370a_33; 1034 1034 1035 - pr_info("%s using %dMHz bus clock\n", 1035 + dev_info(&dev->dev, "%s using %dMHz bus clock\n", 1036 1036 chip_table->name, MHz[clock_slot]); 1037 1037 } 1038 1038