From patchwork Wed Jul 8 12:26:30 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vaibhav Hiremath X-Patchwork-Id: 50874 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f197.google.com (mail-lb0-f197.google.com [209.85.217.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 167FB22A03 for ; Wed, 8 Jul 2015 12:30:08 +0000 (UTC) Received: by lbko2 with SMTP id o2sf1396068lbk.0 for ; Wed, 08 Jul 2015 05:30:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=XgCRhzzBZGO3FOI0/k4IfRR8qWwojmOVMfnuqaHd0M4=; b=XUybG9/9k3gXEgALiZH03cB3kH48Dd1g76Si6DCTpkKUUP4fI8lufYvI92TeAQVxN2 909p5kLhGCJ3P7Wfl7hJeshGLEBWoapgjWLORriEaqEY7RNmx+42l+FT60e3hxqKrtgK 9k+HdDRKqP8jvFC9mbOf9icF+0Brus3BpfetYLMXMjJsKl4yDHvuLq/d45cojIKBqzQ5 IufFMpuOkB8GqZHtONMjXF0+UoNZmAtZtBjMmVNTc2GYa3xw2YBZGDKOhUyl07RM3Pd4 JwgG6GVgaF8aiYb08DVFd2NBqklDWWolqPCegvMlzwejm3I/nM4KMU3UaHCJbQiqTBV1 zqQQ== X-Gm-Message-State: ALoCoQln5vhbBcJzScTv+h40QhJkrjlQhaCO3gx2/ZOzezEnqcrlUDeaIhmNghkd0MY/Ac40wZgd X-Received: by 10.180.198.9 with SMTP id iy9mr6128557wic.7.1436358607021; Wed, 08 Jul 2015 05:30:07 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.21.168 with SMTP id w8ls978998lae.41.gmail; Wed, 08 Jul 2015 05:30:06 -0700 (PDT) X-Received: by 10.152.87.70 with SMTP id v6mr699883laz.98.1436358606821; Wed, 08 Jul 2015 05:30:06 -0700 (PDT) Received: from mail-lb0-f181.google.com (mail-lb0-f181.google.com. [209.85.217.181]) by mx.google.com with ESMTPS id xr5si1855135lbb.76.2015.07.08.05.30.06 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Jul 2015 05:30:06 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.181 as permitted sender) client-ip=209.85.217.181; Received: by lbbpo10 with SMTP id po10so55071480lbb.3 for ; Wed, 08 Jul 2015 05:30:06 -0700 (PDT) X-Received: by 10.152.6.69 with SMTP id y5mr9170338lay.72.1436358606712; Wed, 08 Jul 2015 05:30:06 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp3060143lbb; Wed, 8 Jul 2015 05:30:05 -0700 (PDT) X-Received: by 10.68.180.131 with SMTP id do3mr20037907pbc.42.1436358603452; Wed, 08 Jul 2015 05:30:03 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id tg9si3857451pab.202.2015.07.08.05.30.02; Wed, 08 Jul 2015 05:30:03 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758573AbbGHM37 (ORCPT + 29 others); 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 Received: by pdrg1 with SMTP id g1so13668002pdr.2 for ; Wed, 08 Jul 2015 05:29:45 -0700 (PDT) X-Received: by 10.66.151.133 with SMTP id uq5mr19998703pab.7.1436358585148; Wed, 08 Jul 2015 05:29:45 -0700 (PDT) Received: from localhost.localdomain ([202.62.93.138]) by smtp.gmail.com with ESMTPSA id db1sm2415741pdb.50.2015.07.08.05.29.41 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 08 Jul 2015 05:29:44 -0700 (PDT) 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 Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: vaibhav.hiremath@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.181 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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;