mfd: intel_soc_pmic_chtwc: Use dev_err_probe()
PATCH 1/2 mfd: intel_soc_pmic_chtwc: Use dev_err_probe()
Simplify the mux error path a bit by using dev_err_probe().
--- drivers/mfd/intel_soc_pmic_chtwc.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-)
drivers/mfd/intel_soc_pmic_chtwc.c +7 -12
@@ -179,18 +179,13 @@ static int cht_wc_probe(struct i2c_client *client)int ret; status =acpi_evaluate_integer (ACPI_HANDLE (dev),"_HRV" ,NULL , &hrv); -if (ACPI_FAILURE (status)) { -dev_err (dev,"Failed to get PMIC hardware revision\n" ); -return -ENODEV ; - } -if (hrv !=CHT_WC_HRV ) { -dev_err (dev,"Invalid PMIC hardware revision: %llu\n" , hrv); -return -ENODEV ; - } -if (client->irq <0 ) { -dev_err (dev,"Invalid IRQ\n" ); -return -EINVAL ; - } +if (ACPI_FAILURE (status)) +return dev_err_probe (dev, -ENODEV ,"Failed to get PMIC hardware revision\n" ); +if (hrv !=CHT_WC_HRV ) +return dev_err_probe (dev, -ENODEV ,"Invalid PMIC hardware revision: %llu\n" , hrv); + +if (client->irq <0 ) +return dev_err_probe (dev, -EINVAL ,"Invalid IRQ\n" ); pmic =devm_kzalloc (dev,sizeof (*pmic),GFP_KERNEL );if (!pmic)
Signature · 1 line
2.35.1
PATCH 2/2 mfd: intel_soc_pmic_chtwc: Switch from __maybe_unused to pm_sleep_ptr() etc
Letting the compiler remove these functions when the kernel is built without CONFIG_PM_SLEEP support is simpler and less heavier for builds than the use of __maybe_unused attributes.
--- drivers/mfd/intel_soc_pmic_chtwc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/mfd/intel_soc_pmic_chtwc.c +4 -4
@@ -222,7 +222,7 @@ static void cht_wc_shutdown(struct i2c_client *client)disable_irq (pmic->irq); } -static int __maybe_unused cht_wc_suspend (struct device *dev) +static int cht_wc_suspend (struct device *dev) {struct intel_soc_pmic *pmic =dev_get_drvdata (dev);
@@ -231,7 +231,7 @@ static int __maybe_unused cht_wc_suspend(struct device *dev)return 0 ; } -static int __maybe_unused cht_wc_resume (struct device *dev) +static int cht_wc_resume (struct device *dev) {struct intel_soc_pmic *pmic =dev_get_drvdata (dev);
@@ -239,7 +239,7 @@ static int __maybe_unused cht_wc_resume(struct device *dev)return 0 ; } -static SIMPLE_DEV_PM_OPS(cht_wc_pm_ops, cht_wc_suspend, cht_wc_resume); +static DEFINE_SIMPLE_DEV_PM_OPS(cht_wc_pm_ops, cht_wc_suspend, cht_wc_resume);static const struct i2c_device_id cht_wc_i2c_id[] = { { }
@@ -253,7 +253,7 @@ static const struct acpi_device_id cht_wc_acpi_ids[] = {static struct i2c_driver cht_wc_driver = { .driver = { .name ="CHT Whiskey Cove PMIC" , - .pm = &cht_wc_pm_ops, + .pm =pm_sleep_ptr (&cht_wc_pm_ops), .acpi_match_table = cht_wc_acpi_ids, }, .probe_new = cht_wc_probe,
Signature · 1 line
2.35.1
Hi,
Quoted 3 lines · Andy Shevchenko
Simplify the mux error path a bit by using
dev_err_probe().Signed-off-by Andy Shevchenko <[email protected]>
Thanks, patch looks good to me:
Regards,
Hans
Quoted 34 lines
--- drivers/mfd/intel_soc_pmic_chtwc.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-)drivers/mfd/intel_soc_pmic_chtwc.c +7
-12@@ -179,18 +179,13 @@ static int cht_wc_probe(struct i2c_client *client)int ret; status =acpi_evaluate_integer (ACPI_HANDLE (dev),"_HRV" ,NULL , &hrv); -if (ACPI_FAILURE (status)) { -dev_err (dev,"Failed to get PMIC hardware revision\n" ); -return -ENODEV ; - } -if (hrv !=CHT_WC_HRV ) { -dev_err (dev,"Invalid PMIC hardware revision: %llu\n" , hrv); -return -ENODEV ; - } -if (client->irq <0 ) { -dev_err (dev,"Invalid IRQ\n" ); -return -EINVAL ; - } +if (ACPI_FAILURE (status)) +return dev_err_probe (dev, -ENODEV ,"Failed to get PMIC hardware revision\n" ); +if (hrv !=CHT_WC_HRV ) +return dev_err_probe (dev, -ENODEV ,"Invalid PMIC hardware revision: %llu\n" , hrv); + +if (client->irq <0 ) +return dev_err_probe (dev, -EINVAL ,"Invalid IRQ\n" ); pmic =devm_kzalloc (dev,sizeof (*pmic),GFP_KERNEL );if (!pmic)
Re: [PATCH v1 2/2] mfd: intel_soc_pmic_chtwc: Switch from __maybe_unused to pm_sleep_ptr() etc
In reply to Andy ShevchenkoHi,
Quoted 5 lines · Andy Shevchenko
Letting the compiler remove these functions when the kernel is built without
CONFIG_PM_SLEEPsupport is simpler and less heavier for builds than the use of__maybe_unusedattributes.Signed-off-by Andy Shevchenko <[email protected]>
I don't see how this helps, __maybe_unused only means the compiler should not warn AFAIK it is still allowed to remove static globals which are unused even of they are marked __maybe_unused ?
And DEFINE_SIMPLE_DEV_PM_OPS does not mark the dev_pm_ops as __maybe_unused where as pm_sleep_ptr() will not reference the struct when CONFIG_PM is not set.
But I guess that the new PTR_IF magic:
#define PTR_IF(cond, ptr) ((cond) ? (ptr) : NULL)
Still counts as referencing the struct so we don't get an unused warning and since cond is a const 0 value the compiler can optimize things away ?
Regards,
Hans
Quoted 44 lines
--- drivers/mfd/intel_soc_pmic_chtwc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/mfd/intel_soc_pmic_chtwc.c +4
-4@@ -222,7 +222,7 @@ static void cht_wc_shutdown(struct i2c_client *client)disable_irq (pmic->irq); } -static int __maybe_unused cht_wc_suspend (struct device *dev) +static int cht_wc_suspend (struct device *dev) {struct intel_soc_pmic *pmic =dev_get_drvdata (dev);@@ -231,7 +231,7 @@ static int __maybe_unused cht_wc_suspend(struct device *dev)return 0 ; } -static int __maybe_unused cht_wc_resume (struct device *dev) +static int cht_wc_resume (struct device *dev) {struct intel_soc_pmic *pmic =dev_get_drvdata (dev);@@ -239,7 +239,7 @@ static int __maybe_unused cht_wc_resume(struct device *dev)return 0 ; } -static SIMPLE_DEV_PM_OPS(cht_wc_pm_ops, cht_wc_suspend, cht_wc_resume); +static DEFINE_SIMPLE_DEV_PM_OPS(cht_wc_pm_ops, cht_wc_suspend, cht_wc_resume);static const struct i2c_device_id cht_wc_i2c_id[] = { { }@@ -253,7 +253,7 @@ static const struct acpi_device_id cht_wc_acpi_ids[] = {static struct i2c_driver cht_wc_driver = { .driver = { .name ="CHT Whiskey Cove PMIC" , - .pm = &cht_wc_pm_ops, + .pm =pm_sleep_ptr (&cht_wc_pm_ops), .acpi_match_table = cht_wc_acpi_ids, }, .probe_new = cht_wc_probe,
Re: [PATCH v1 2/2] mfd: intel_soc_pmic_chtwc: Switch from __maybe_unused to pm_sleep_ptr() etc
In reply to Andy ShevchenkoHi,
Quoted 5 lines · Andy Shevchenko
Letting the compiler remove these functions when the kernel is built without
CONFIG_PM_SLEEPsupport is simpler and less heavier for builds than the use of__maybe_unusedattributes.Signed-off-by Andy Shevchenko <[email protected]>
I see that this basically converts the code to the new way of dealing with pm_ops, so after a second look:
Regards,
Hans
Quoted 44 lines
--- drivers/mfd/intel_soc_pmic_chtwc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/mfd/intel_soc_pmic_chtwc.c +4
-4@@ -222,7 +222,7 @@ static void cht_wc_shutdown(struct i2c_client *client)disable_irq (pmic->irq); } -static int __maybe_unused cht_wc_suspend (struct device *dev) +static int cht_wc_suspend (struct device *dev) {struct intel_soc_pmic *pmic =dev_get_drvdata (dev);@@ -231,7 +231,7 @@ static int __maybe_unused cht_wc_suspend(struct device *dev)return 0 ; } -static int __maybe_unused cht_wc_resume (struct device *dev) +static int cht_wc_resume (struct device *dev) {struct intel_soc_pmic *pmic =dev_get_drvdata (dev);@@ -239,7 +239,7 @@ static int __maybe_unused cht_wc_resume(struct device *dev)return 0 ; } -static SIMPLE_DEV_PM_OPS(cht_wc_pm_ops, cht_wc_suspend, cht_wc_resume); +static DEFINE_SIMPLE_DEV_PM_OPS(cht_wc_pm_ops, cht_wc_suspend, cht_wc_resume);static const struct i2c_device_id cht_wc_i2c_id[] = { { }@@ -253,7 +253,7 @@ static const struct acpi_device_id cht_wc_acpi_ids[] = {static struct i2c_driver cht_wc_driver = { .driver = { .name ="CHT Whiskey Cove PMIC" , - .pm = &cht_wc_pm_ops, + .pm =pm_sleep_ptr (&cht_wc_pm_ops), .acpi_match_table = cht_wc_acpi_ids, }, .probe_new = cht_wc_probe,
Re: [PATCH v1 2/2] mfd: intel_soc_pmic_chtwc: Switch from __maybe_unused to pm_sleep_ptr() etc
In reply to Hans de GoedeQuoted 10 lines · Hans de Goede
Quoted 5 lines · Andy Shevchenko
Letting the compiler remove these functions when the kernel is built without
CONFIG_PM_SLEEPsupport is simpler and less heavier for builds than the use of__maybe_unusedattributes.Signed-off-by Andy Shevchenko <[email protected]>I don't see how this helps,
__maybe_unusedonly means the compiler should not warn AFAIK it is still allowed to remove static globals which are unused even of they are marked__maybe_unused?
__maybe_unused will force compiler to compile and linker to drop the section. The proposed approach saves resources on build, i.e. it's already compiler that decides not to compile the code.
Quoted 11 lines
And
DEFINE_SIMPLE_DEV_PM_OPSdoes not mark thedev_pm_opsas__maybe_unusedwhere aspm_sleep_ptr()will not reference the struct whenCONFIG_PMis not set.But I guess that the new
PTR_IFmagic:#define
PTR_IF(cond, ptr)((cond) ? (ptr) : NULL)Still counts as referencing the struct so we don't get an unused warning and since cond is a const 0 value the compiler can optimize things away ?
See above, it's not olny about warning and compiler.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Re: [PATCH v1 2/2] mfd: intel_soc_pmic_chtwc: Switch from __maybe_unused to pm_sleep_ptr() etc
In reply to Hans de GoedeQuoted 11 lines · Hans de Goede
Quoted 5 lines · Andy Shevchenko
Letting the compiler remove these functions when the kernel is built without
CONFIG_PM_SLEEPsupport is simpler and less heavier for builds than the use of__maybe_unusedattributes.Signed-off-by Andy Shevchenko <[email protected]>I see that this basically converts the code to the new way of dealing with
pm_ops, so after a second look:Reviewed-by Hans de Goede <[email protected]>
Thanks!
Signature · 2 lines
With Best Regards, Andy Shevchenko
Lee Jones
AppliedQuoted 6 lines · Andy Shevchenko
Simplify the mux error path a bit by using
dev_err_probe().Signed-off-by Andy Shevchenko <[email protected]>--- drivers/mfd/intel_soc_pmic_chtwc.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-)
Applied, thanks.
Signature · 4 lines
Lee Jones [李琼斯] Principal Technical Lead - Developer Services Linaro.org │ Open source software for Arm SoCs Follow Linaro: Facebook | Twitter | Blog
Lee Jones
AppliedRe: [PATCH v1 2/2] mfd: intel_soc_pmic_chtwc: Switch from __maybe_unused to pm_sleep_ptr() etc
In reply to Andy ShevchenkoQuoted 8 lines · Andy Shevchenko
Letting the compiler remove these functions when the kernel is built without
CONFIG_PM_SLEEPsupport is simpler and less heavier for builds than the use of__maybe_unusedattributes.Signed-off-by Andy Shevchenko <[email protected]>--- drivers/mfd/intel_soc_pmic_chtwc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
Applied, thanks.
Signature · 4 lines
Lee Jones [李琼斯] Principal Technical Lead - Developer Services Linaro.org │ Open source software for Arm SoCs Follow Linaro: Facebook | Twitter | Blog