From a2f07305e53545dceb08724ed86345c198b2a91a Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Sat, 13 Apr 2013 22:05:43 +0800 Subject: regulator: max8997: Test pdata by NULL checking instead of IS_ERR_OR_NULL pdata is either a valid pointer or NULL, use NULL checking rather than IS_ERR_OR_NULL macro. Signed-off-by: Axel Lin Signed-off-by: Mark Brown --- drivers/regulator/max8997.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/regulator') diff --git a/drivers/regulator/max8997.c b/drivers/regulator/max8997.c index 0ac7a87519b4..df20069f0537 100644 --- a/drivers/regulator/max8997.c +++ b/drivers/regulator/max8997.c @@ -1035,8 +1035,8 @@ static int max8997_pmic_probe(struct platform_device *pdev) int i, ret, size, nr_dvs; u8 max_buck1 = 0, max_buck2 = 0, max_buck5 = 0; - if (IS_ERR_OR_NULL(pdata)) { - dev_err(pdev->dev.parent, "No platform init data supplied.\n"); + if (!pdata) { + dev_err(&pdev->dev, "No platform init data supplied.\n"); return -ENODEV; } -- cgit v1.2.3