Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758568AbbGHM37 (ORCPT ); Wed, 8 Jul 2015 08:29:59 -0400 Received: from mail-pd0-f175.google.com ([209.85.192.175]:34872 "EHLO mail-pd0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758480AbbGHM3p (ORCPT ); Wed, 8 Jul 2015 08:29:45 -0400 From: Vaibhav Hiremath To: linux-arm-kernel@lists.infradead.org Cc: Vaibhav Hiremath , Samuel Ortiz , Lee Jones , linux-kernel@vger.kernel.org (open list) Subject: [PATCH-v6 4/6] mfd: 88pm800: Remove unnecessary protection around pdata Date: Wed, 8 Jul 2015 17:56:30 +0530 Message-Id: <1436358392-15449-5-git-send-email-vaibhav.hiremath@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1436358392-15449-1-git-send-email-vaibhav.hiremath@linaro.org> References: <1436358392-15449-1-git-send-email-vaibhav.hiremath@linaro.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2168 Lines: 65 With addition of proper checks in place in pm800_probe function, which makes sure that pdata would never become NULL. So remove all unnecessary protection around pdata in whole driver code. Signed-off-by: Vaibhav Hiremath Reviewed-by: Krzysztof Kozlowski Acked-by: Lee Jones --- drivers/mfd/88pm800.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/drivers/mfd/88pm800.c b/drivers/mfd/88pm800.c index af8232f..074ba8b 100644 --- a/drivers/mfd/88pm800.c +++ b/drivers/mfd/88pm800.c @@ -302,7 +302,7 @@ static int device_gpadc_init(struct pm80x_chip *chip) mask = (PM800_GPADC_GP_BIAS_EN0 | PM800_GPADC_GP_BIAS_EN1 | PM800_GPADC_GP_BIAS_EN2 | PM800_GPADC_GP_BIAS_EN3); - if (pdata && (pdata->batt_det == 0)) + if (pdata->batt_det == 0) data = (PM800_GPADC_GP_BIAS_EN0 | PM800_GPADC_GP_BIAS_EN1 | PM800_GPADC_GP_BIAS_EN2 | PM800_GPADC_GP_BIAS_EN3); else @@ -331,11 +331,8 @@ static int device_rtc_init(struct pm80x_chip *chip) { struct pm80x_platform_data *pdata = dev_get_platdata(chip->dev); - if (pdata) { - rtc_devs[0].platform_data = pdata->rtc; - rtc_devs[0].pdata_size = - pdata->rtc ? sizeof(struct pm80x_rtc_pdata) : 0; - } + rtc_devs[0].platform_data = pdata->rtc; + rtc_devs[0].pdata_size = pdata->rtc ? sizeof(struct pm80x_rtc_pdata) : 0; return mfd_add_devices(chip->dev, 0, &rtc_devs[0], ARRAY_SIZE(rtc_devs), NULL, 0, NULL); @@ -478,7 +475,7 @@ static int device_800_init(struct pm80x_chip *chip) goto out; } if (val & PM800_ALARM_WAKEUP) { - if (pdata && pdata->rtc) + if (pdata->rtc) pdata->rtc->rtc_wakeup = 1; } @@ -580,7 +577,7 @@ static int pm800_probe(struct i2c_client *client, goto err_device_init; } - if (pdata && pdata->plat_config) + if (pdata->plat_config) pdata->plat_config(chip, pdata); return 0; -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/