ACPI: PMIC: Convert pr_*() to dev_*() printing macros

Since we have a device pointer in the regmap, use it for
error messages.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/acpi/pmic/intel_pmic_chtwc.c b/drivers/acpi/pmic/intel_pmic_chtwc.c
index f2c42f4c79ca881aedfc988983d92ff3f7e91ecd..25aa3e33b09a1fbe3d2a557ae9413f2aef5198cf 100644 (file)
--- a/drivers/acpi/pmic/intel_pmic_chtwc.c
+++ b/drivers/acpi/pmic/intel_pmic_chtwc.c
@@ -236,11 +236,12 @@ static int intel_cht_wc_exec_mipi_pmic_seq_element(struct regmap *regmap,
                                                   u32 reg_address,
                                                   u32 value, u32 mask)
 {
+       struct device *dev = regmap_get_device(regmap);
        u32 address;
 
        if (i2c_client_address > 0xff || reg_address > 0xff) {
-               pr_warn("%s warning addresses too big client 0x%x reg 0x%x\n",
-                       __func__, i2c_client_address, reg_address);
+               dev_warn(dev, "warning addresses too big client 0x%x reg 0x%x\n",
+                        i2c_client_address, reg_address);
                return -ERANGE;
        }
 

diff --git a/drivers/acpi/pmic/intel_pmic_xpower.c b/drivers/acpi/pmic/intel_pmic_xpower.c
index 33c5e85294cd691b0cd5c727d41d991e7ea8a121..43c5850b4bf33c6a360a75e3a96082b59410ccdd 100644 (file)
--- a/drivers/acpi/pmic/intel_pmic_xpower.c
+++ b/drivers/acpi/pmic/intel_pmic_xpower.c
@@ -274,11 +274,12 @@ static int intel_xpower_exec_mipi_pmic_seq_element(struct regmap *regmap,
                                                   u16 i2c_address, u32 reg_address,
                                                   u32 value, u32 mask)
 {
+       struct device *dev = regmap_get_device(regmap);
        int ret;
 
        if (i2c_address != 0x34) {
-               pr_err("%s: Unexpected i2c-addr: 0x%02x (reg-addr 0x%x value 0x%x mask 0x%x)\n",
-                      __func__, i2c_address, reg_address, value, mask);
+               dev_err(dev, "Unexpected i2c-addr: 0x%02x (reg-addr 0x%x value 0x%x mask 0x%x)\n",
+                       i2c_address, reg_address, value, mask);
                return -ENXIO;
        }