From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751858AbbCJATV (ORCPT ); Mon, 9 Mar 2015 20:19:21 -0400 Received: from mailout1.samsung.com ([203.254.224.24]:17581 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751620AbbCJATN (ORCPT ); Mon, 9 Mar 2015 20:19:13 -0400 X-AuditID: cbfee68e-f79b46d000002b74-1d-54fe3879d4a7 From: Chanwoo Choi To: linux-kernel@vger.kernel.org, myungjoo.ham@samsung.com, kyungmin.park@samsung.com, cw00.choi@samsung.com Subject: [PATCH 2/2] extcon: Fix the checkpatch warning Date: Tue, 10 Mar 2015 09:19:03 +0900 Message-id: <1425946743-25111-3-git-send-email-cw00.choi@samsung.com> X-Mailer: git-send-email 1.8.5.5 In-reply-to: <1425946743-25111-1-git-send-email-cw00.choi@samsung.com> References: <1425946743-25111-1-git-send-email-cw00.choi@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrILMWRmVeSWpSXmKPExsWyRsSkRLfS4l+IwfcWQYvrX56zWpxtesNu cXnXHDaL240r2BxYPPq2rGL0+LxJLoApissmJTUnsyy1SN8ugSvjT/8p5oKDmhVtXY+YGxgn KHUxcnJICJhIrH5wlRHCFpO4cG89G4gtJLCUUeLsQ0GYml2rDjF3MXIBxaczSpxa1sIK4TQx SXy6dY4VpIpNQEti/4sbYN0iAnkSc+6+ZQGxhQXMJZoOtoFtYBFQlbh0+SE7iM0r4CrxdvM9 FogNChLLls8Em8Mp4CaxdeIsqCtcJXpvXWMDWSYhcJ9N4sfz9+wQgwQkvk0+BNTMAZSQldh0 gBlijqTEwRU3WCYwCi1gZFjFKJpakFxQnJReZKRXnJhbXJqXrpecn7uJERiSp/8969vBePOA 9SFGAQ5GJR5eBpN/IUKsiWXFlbmHGE2BNkxklhJNzgcGfl5JvKGxmZGFqYmpsZG5pZmSOG+C 1M9gIYH0xJLU7NTUgtSi+KLSnNTiQ4xMHJxSDYwNT3wCn/K4zzSY/Um4TiRX0DbQMNhEyHCV khSzXmOn4LtZt8WN+C4tfSGdvkP1z/RWlaP/6jhCvtYe1WcNz5QrOPZ2SqqNEY+0qHLHh5AD YsKNwgdlQidLGLR//euSGT3p22ah65/Wiyzbx9h73Oghz93el2n8K3m+fjgXIWPgf9Tu0v+1 DEosxRmJhlrMRcWJAB0mJgZEAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrDLMWRmVeSWpSXmKPExsVy+t9jQd1Ki38hBtMfc1pc//Kc1eJs0xt2 i8u75rBZ3G5cwebA4tG3ZRWjx+dNcgFMUQ2MNhmpiSmpRQqpecn5KZl56bZK3sHxzvGmZgaG uoaWFuZKCnmJuam2Si4+AbpumTlAm5QUyhJzSoFCAYnFxUr6dpgmhIa46VrANEbo+oYEwfUY GaCBhDWMGX/6TzEXHNSsaOt6xNzAOEGpi5GTQ0LARGLXqkPMELaYxIV769m6GLk4hASmM0qc WtbCCuE0MUl8unWOFaSKTUBLYv+LG2wgtohAnsScu29ZQGxhAXOJpoNtjCA2i4CqxKXLD9lB bF4BV4m3m++xQGxQkFi2fCbYHE4BN4mtE2eBzRECqum9dY1tAiPPAkaGVYyiqQXJBcVJ6blG esWJucWleel6yfm5mxjBIf9MegfjqgaLQ4wCHIxKPLwMJv9ChFgTy4orcw8xSnAwK4nwSmgB hXhTEiurUovy44tKc1KLDzGaAl01kVlKNDkfGI95JfGGxiZmRpZG5oYWRsbmSuK8SvZtIUIC 6YklqdmpqQWpRTB9TBycUg2MRZGThLQ0D5m7mcZdydI03aRldFxYLXJazMT281YS0SsY2p+s vMsqrGh7NP2TXEHMHtvbhsFSW8xvVUTvKa2/v08tq3lC6xGBYx12t696ud9a/SqhoXBqfmsr z7bgdsEnrHfubNjVz5WdKlaxa6Fv5d8lE5ffV2lx9bj7f1NC2YO3zm3P1x5UYinOSDTUYi4q TgQAJE8ntY8CAAA= DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch fixes the checkpatch warning about coding style. Signed-off-by: Chanwoo Choi --- drivers/extcon/extcon-max14577.c | 5 +---- drivers/extcon/extcon-max77693.c | 5 +---- drivers/extcon/extcon-max8997.c | 5 +---- drivers/extcon/extcon-rt8973a.c | 6 ++---- drivers/extcon/extcon-sm5502.c | 6 +++--- drivers/extcon/extcon-usb-gpio.c | 2 +- drivers/extcon/extcon.c | 1 + 7 files changed, 10 insertions(+), 20 deletions(-) diff --git a/drivers/extcon/extcon-max14577.c b/drivers/extcon/extcon-max14577.c index c1bf0cf..3823aa4 100644 --- a/drivers/extcon/extcon-max14577.c +++ b/drivers/extcon/extcon-max14577.c @@ -539,8 +539,6 @@ static void max14577_muic_irq_work(struct work_struct *work) dev_err(info->dev, "failed to handle MUIC interrupt\n"); mutex_unlock(&info->mutex); - - return; } /* @@ -730,8 +728,7 @@ static int max14577_muic_probe(struct platform_device *pdev) muic_irq->name, info); if (ret) { dev_err(&pdev->dev, - "failed: irq request (IRQ: %d," - " error :%d)\n", + "failed: irq request (IRQ: %d, error :%d)\n", muic_irq->irq, ret); return ret; } diff --git a/drivers/extcon/extcon-max77693.c b/drivers/extcon/extcon-max77693.c index dfcc5cb..a66bec8 100644 --- a/drivers/extcon/extcon-max77693.c +++ b/drivers/extcon/extcon-max77693.c @@ -1019,8 +1019,6 @@ static void max77693_muic_irq_work(struct work_struct *work) dev_err(info->dev, "failed to handle MUIC interrupt\n"); mutex_unlock(&info->mutex); - - return; } static irqreturn_t max77693_muic_irq_handler(int irq, void *data) @@ -1171,8 +1169,7 @@ static int max77693_muic_probe(struct platform_device *pdev) muic_irq->name, info); if (ret) { dev_err(&pdev->dev, - "failed: irq request (IRQ: %d," - " error :%d)\n", + "failed: irq request (IRQ: %d, error :%d)\n", muic_irq->irq, ret); return ret; } diff --git a/drivers/extcon/extcon-max8997.c b/drivers/extcon/extcon-max8997.c index fc1678f..5774e56 100644 --- a/drivers/extcon/extcon-max8997.c +++ b/drivers/extcon/extcon-max8997.c @@ -579,8 +579,6 @@ static void max8997_muic_irq_work(struct work_struct *work) dev_err(info->dev, "failed to handle MUIC interrupt\n"); mutex_unlock(&info->mutex); - - return; } static irqreturn_t max8997_muic_irq_handler(int irq, void *data) @@ -689,8 +687,7 @@ static int max8997_muic_probe(struct platform_device *pdev) muic_irq->name, info); if (ret) { dev_err(&pdev->dev, - "failed: irq request (IRQ: %d," - " error :%d)\n", + "failed: irq request (IRQ: %d, error :%d)\n", muic_irq->irq, ret); goto err_irq; } diff --git a/drivers/extcon/extcon-rt8973a.c b/drivers/extcon/extcon-rt8973a.c index a784b2d..9ccd5af 100644 --- a/drivers/extcon/extcon-rt8973a.c +++ b/drivers/extcon/extcon-rt8973a.c @@ -582,10 +582,8 @@ static int rt8973a_muic_i2c_probe(struct i2c_client *i2c, return -EINVAL; info = devm_kzalloc(&i2c->dev, sizeof(*info), GFP_KERNEL); - if (!info) { - dev_err(&i2c->dev, "failed to allocate memory\n"); + if (!info) return -ENOMEM; - } i2c_set_clientdata(i2c, info); info->dev = &i2c->dev; @@ -681,7 +679,7 @@ static int rt8973a_muic_i2c_remove(struct i2c_client *i2c) return 0; } -static struct of_device_id rt8973a_dt_match[] = { +static const struct of_device_id rt8973a_dt_match[] = { { .compatible = "richtek,rt8973a-muic" }, { }, }; diff --git a/drivers/extcon/extcon-sm5502.c b/drivers/extcon/extcon-sm5502.c index b0f7bd8..2f93cf3 100644 --- a/drivers/extcon/extcon-sm5502.c +++ b/drivers/extcon/extcon-sm5502.c @@ -359,8 +359,8 @@ static unsigned int sm5502_muic_get_cable_type(struct sm5502_muic_info *info) break; default: dev_dbg(info->dev, - "cannot identify the cable type: adc(0x%x) " - "dev_type1(0x%x)\n", adc, dev_type1); + "cannot identify the cable type: adc(0x%x)\n", + adc); return -EINVAL; }; break; @@ -659,7 +659,7 @@ static int sm5502_muic_i2c_remove(struct i2c_client *i2c) return 0; } -static struct of_device_id sm5502_dt_match[] = { +static const struct of_device_id sm5502_dt_match[] = { { .compatible = "siliconmitus,sm5502-muic" }, { }, }; diff --git a/drivers/extcon/extcon-usb-gpio.c b/drivers/extcon/extcon-usb-gpio.c index 3f0bad3..de67fce 100644 --- a/drivers/extcon/extcon-usb-gpio.c +++ b/drivers/extcon/extcon-usb-gpio.c @@ -214,7 +214,7 @@ static int usb_extcon_resume(struct device *dev) static SIMPLE_DEV_PM_OPS(usb_extcon_pm_ops, usb_extcon_suspend, usb_extcon_resume); -static struct of_device_id usb_extcon_dt_match[] = { +static const struct of_device_id usb_extcon_dt_match[] = { { .compatible = "linux,extcon-usb-gpio", }, { /* sentinel */ } }; diff --git a/drivers/extcon/extcon.c b/drivers/extcon/extcon.c index 8319f25..752ce12 100644 --- a/drivers/extcon/extcon.c +++ b/drivers/extcon/extcon.c @@ -158,6 +158,7 @@ static ssize_t name_show(struct device *dev, struct device_attribute *attr, /* Optional callback given by the user */ if (edev->print_name) { int ret = edev->print_name(edev, buf); + if (ret >= 0) return ret; } -- 1.8.5.5