From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752541AbbFXL0j (ORCPT ); Wed, 24 Jun 2015 07:26:39 -0400 Received: from cpanel09.rubas.ch ([195.182.222.79]:42701 "EHLO cpanel09.tophost.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752218AbbFXL0b (ORCPT ); Wed, 24 Jun 2015 07:26:31 -0400 X-Greylist: delayed 3741 seconds by postgrey-1.27 at vger.kernel.org; Wed, 24 Jun 2015 07:26:31 EDT From: =?UTF-8?q?J=C3=BCrg=20Billeter?= To: Greg Kroah-Hartman Cc: Gigi Joseph , Colin Ian King , linux-kernel@vger.kernel.org, =?UTF-8?q?J=C3=BCrg=20Billeter?= Subject: [PATCH 2/3] ti-st: st_kim: fix nshutdown_gpio in get_platform_data Date: Wed, 24 Jun 2015 12:24:05 +0200 Message-Id: <1435141446-27236-2-git-send-email-j@bitron.ch> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1435141446-27236-1-git-send-email-j@bitron.ch> References: <1435141446-27236-1-git-send-email-j@bitron.ch> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - cpanel09.tophost.ch X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - bitron.ch X-Get-Message-Sender-Via: cpanel09.tophost.ch: authenticated_id: juerg@bitron.ch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use of_get_named_gpio instead of of_property_read_u32. Signed-off-by: Jürg Billeter --- drivers/misc/ti-st/st_kim.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/drivers/misc/ti-st/st_kim.c b/drivers/misc/ti-st/st_kim.c index af71584..8df8faa 100644 --- a/drivers/misc/ti-st/st_kim.c +++ b/drivers/misc/ti-st/st_kim.c @@ -38,6 +38,7 @@ #include #include #include +#include #define MAX_ST_DEVICES 3 /* Imagine 1 on each UART for now */ static struct platform_device *st_kim_devices[MAX_ST_DEVICES]; @@ -749,7 +750,7 @@ static struct ti_st_plat_data *get_platform_data(struct device *dev) { struct device_node *np = dev->of_node; const u32 *dt_property; - int len; + int len, gpio; dt_pdata = kzalloc(sizeof(*dt_pdata), GFP_KERNEL); @@ -761,8 +762,14 @@ static struct ti_st_plat_data *get_platform_data(struct device *dev) dt_property = of_get_property(np, "dev_name", &len); if (dt_property) memcpy(&dt_pdata->dev_name, dt_property, len); - of_property_read_u32(np, "nshutdown_gpio", - &dt_pdata->nshutdown_gpio); + + gpio = of_get_named_gpio(np, "nshutdown_gpio", 0); + if (gpio < 0) { + kfree(dt_pdata); + return ERR_PTR(gpio); + } + dt_pdata->nshutdown_gpio = gpio; + of_property_read_u32(np, "flow_cntrl", &dt_pdata->flow_cntrl); of_property_read_u32(np, "baud_rate", &dt_pdata->baud_rate); -- 2.4.3