From patchwork Wed Dec 18 01:48:07 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingoo Han X-Patchwork-Id: 302610 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id E1C882C009A for ; Wed, 18 Dec 2013 12:48:15 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751945Ab3LRBsO (ORCPT ); Tue, 17 Dec 2013 20:48:14 -0500 Received: from mailout3.samsung.com ([203.254.224.33]:26665 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750875Ab3LRBsO (ORCPT ); Tue, 17 Dec 2013 20:48:14 -0500 Received: from epcpsbgr3.samsung.com (u143.gpu120.samsung.co.kr [203.254.230.143]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MXZ000GKBO7H440@mailout3.samsung.com> for linux-i2c@vger.kernel.org; Wed, 18 Dec 2013 10:48:07 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [203.254.230.50]) by epcpsbgr3.samsung.com (EPCPMTA) with SMTP id F1.FD.05880.7DEF0B25; Wed, 18 Dec 2013 10:48:07 +0900 (KST) X-AuditID: cbfee68f-b7fe36d0000016f8-95-52b0fed70076 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id FC.3D.20899.7DEF0B25; Wed, 18 Dec 2013 10:48:07 +0900 (KST) Received: from DOJG1HAN03 ([12.23.120.99]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MXZ00BLSBO7P9A0@mmp2.samsung.com>; Wed, 18 Dec 2013 10:48:07 +0900 (KST) From: Jingoo Han To: 'Wolfram Sang' Cc: linux-i2c@vger.kernel.org, 'Jean Delvare' , 'Jingoo Han' References: <001601cefaf3$940d0040$bc2700c0$%han@samsung.com> <002801cefaf4$69243d70$3b6cb850$%han@samsung.com> In-reply-to: <002801cefaf4$69243d70$3b6cb850$%han@samsung.com> Subject: [PATCH V2 04/13] i2c: isch: Use devm_request_region() Date: Wed, 18 Dec 2013 10:48:07 +0900 Message-id: <007501cefb93$32ca0df0$985e29d0$%han@samsung.com> MIME-version: 1.0 Content-type: text/plain; charset=us-ascii Content-transfer-encoding: 7bit X-Mailer: Microsoft Office Outlook 12.0 Thread-index: Ac7685PVHbujt8MeRNi0GNiruYn2+wAALa5QACeNnDA= Content-language: ko X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrNIsWRmVeSWpSXmKPExsVy+t8zI93r/zYEGfz7J2ZxeeElVovGv5EW HX+/MFqsPDGL2YHF40rDSTaPvi2rGD1OnnrC4vF5k1wASxSXTUpqTmZZapG+XQJXRuemGWwF N7grXh75xNbAeI2zi5GTQ0LARKL94zdmCFtM4sK99WxdjFwcQgLLGCV+nvvICFN0e9k6RojE dEaJm78vsYMkhAR+MUqc/M0HYrMJqEl8+XIYLC4CZD/7+BWsmVkgQ+Lw0s8sEPWFEhsfLWXq YuTg4BSwk+h8ow8SFgYyXx3+DlbCIqAqMX9lIxuIzStgK/H24ywoW1Dix+R7LBAjtSTW7zzO BGHLS2xe85YZZKSEgLrEo7+6EBdYSSyYcweqXERi34t3YOdLCJxil1hxop0RYpeAxLfJh1gg emUlNh2AhoOkxMEVN1gmMErMQrJ5FpLNs5BsnoVkxQJGllWMoqkFyQXFSelFxnrFibnFpXnp esn5uZsYIRHZv4Px7gHrQ4zJQOsnMkuJJucDIzqvJN7Q2MzIwtTE1NjI3NKMNGElcd77D5OC hATSE0tSs1NTC1KL4otKc1KLDzEycXBKNTAGRzn4MGyMOytfIXrcekLj7qmn9lRdemJ1PMZi Z+4P12bLCXJW+4+fM7r2Sd2Co+w5p+z2t5vj/6fc3vFjbutR80UzZB4s3r5qQ/WFuae2FQpW a1xa2DLB70+oaefk2ar/wjsuvc9iWdfHaSzpUbguX1/WzvroaufuLRemHNz3dN/L05pLVR3E lViKMxINtZiLihMBGL98Rd4CAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrBKsWRmVeSWpSXmKPExsVy+t9jQd3r/zYEGZxYLGxxeeElVovGv5EW HX+/MFqsPDGL2YHF40rDSTaPvi2rGD1OnnrC4vF5k1wAS1QDo01GamJKapFCal5yfkpmXrqt kndwvHO8qZmBoa6hpYW5kkJeYm6qrZKLT4CuW2YO0EolhbLEnFKgUEBicbGSvh2mCaEhbroW MI0Rur4hQXA9RgZoIGEdY0bnphlsBTe4K14e+cTWwHiNs4uRk0NCwETi9rJ1jBC2mMSFe+vZ uhi5OIQEpjNK3Px9iR0kISTwi1Hi5G8+EJtNQE3iy5fDYHERIPvZx69gzcwCGRKHl35mgagv lNj4aClTFyMHB6eAnUTnG32QsDCQ+erwd7ASFgFVifkrG9lAbF4BW4m3H2dB2YISPybfY4EY qSWxfudxJghbXmLzmrfMICMlBNQlHv3VhbjASmLBnDtQ5SIS+168Y5zAKDQLyaRZSCbNQjJp FpKWBYwsqxhFUwuSC4qT0nON9IoTc4tL89L1kvNzNzGC4/2Z9A7GVQ0WhxgFOBiVeHg5Zq8P EmJNLCuuzD3EKMHBrCTCu/PehiAh3pTEyqrUovz4otKc1OJDjMlAj05klhJNzgemorySeENj EzMjSyMzCyMTc3PShJXEeQ+2WgcKCaQnlqRmp6YWpBbBbGHi4JRqYPTgm+IvZfVULnvSwuBt x3Z7ZG88W5Y113nRgVvnXi65LKTX5mFYLBvhdVRYtyXGesZUhXKhG8LMHBP0n/QGbL177bjc 8lVHFm68N+1uiJ4pz2+J+87HI3rjwr1Etzw+VvTKy8700e8VCdNvdTUe8fY8p5FzMqOnYd38 deHrLprrZ3Ks0nDhS1FiKc5INNRiLipOBAD3NUXjOwMAAA== DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org Use devm_request_region() to make cleanup paths simpler. Signed-off-by: Jingoo Han Reviewed-by: Jean Delvare --- Changes since V1: - Remove unnecessary 'res' variable from smbus_sch_remove(). drivers/i2c/busses/i2c-isch.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/i2c/busses/i2c-isch.c b/drivers/i2c/busses/i2c-isch.c index 8c38aaa..af21304 100644 --- a/drivers/i2c/busses/i2c-isch.c +++ b/drivers/i2c/busses/i2c-isch.c @@ -275,7 +275,8 @@ static int smbus_sch_probe(struct platform_device *dev) if (!res) return -EBUSY; - if (!request_region(res->start, resource_size(res), dev->name)) { + if (!devm_request_region(&dev->dev, res->start, resource_size(res), + dev->name)) { dev_err(&dev->dev, "SMBus region 0x%x already in use!\n", sch_smba); return -EBUSY; @@ -294,7 +295,6 @@ static int smbus_sch_probe(struct platform_device *dev) retval = i2c_add_adapter(&sch_adapter); if (retval) { dev_err(&dev->dev, "Couldn't register adapter!\n"); - release_region(res->start, resource_size(res)); sch_smba = 0; } @@ -303,11 +303,8 @@ static int smbus_sch_probe(struct platform_device *dev) static int smbus_sch_remove(struct platform_device *pdev) { - struct resource *res; if (sch_smba) { i2c_del_adapter(&sch_adapter); - res = platform_get_resource(pdev, IORESOURCE_IO, 0); - release_region(res->start, resource_size(res)); sch_smba = 0; }