From patchwork Thu Oct 31 11:08:07 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tushar Behera X-Patchwork-Id: 21303 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qe0-f71.google.com (mail-qe0-f71.google.com [209.85.128.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6FA8820F2F for ; Thu, 31 Oct 2013 11:09:51 +0000 (UTC) Received: by mail-qe0-f71.google.com with SMTP id 1sf5613786qec.2 for ; Thu, 31 Oct 2013 04:09:51 -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:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=mO1HXm35T01HSzonqRgRp3A4/AXFSLXhAmmfjypV6I4=; b=Z37D0wllbnaFzAG2U3Ce4rn2/FlgQes5D3iFo9/cdX0QPiRgynO7uW8BWlD26pr2LK MR3BVp9ciWg2VMyTJ4Pdpa11P1+wMph+ylhuj4T7GepaHoHrerhDs4fD44zQjXoAet9z DpPtKVHKWyg8B4fLuGH3VW9WMFh8zBKj6jCNGwGPPvDGCcdh2UwdYnTCBzIJINo1M6Bp o0pWSgkeTECljY8G9GYIrd2vDSrkqQcjcLo9eOTXwUppFvos7F36C8YHbfT1Cra+/Oeh YnGyR+mDHvLiXuI1C/AeIy84bi6ctm4JWE9E9Ev72OvXxBk0TSsQnJFei7efuL2g2Wj3 +Usw== X-Gm-Message-State: ALoCoQkBGS5irbDlVCaA6xQpZ26A1Jm8n1kcC8XMy4NHg9fvvtKV4LKKWrvwZIMlOIoSdOleD2Yf X-Received: by 10.58.188.113 with SMTP id fz17mr865229vec.26.1383217790847; Thu, 31 Oct 2013 04:09:50 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.35.111 with SMTP id g15ls931065qej.21.gmail; Thu, 31 Oct 2013 04:09:50 -0700 (PDT) X-Received: by 10.52.118.73 with SMTP id kk9mr1234415vdb.13.1383217790738; Thu, 31 Oct 2013 04:09:50 -0700 (PDT) Received: from mail-vb0-f41.google.com (mail-vb0-f41.google.com [209.85.212.41]) by mx.google.com with ESMTPS id tb3si654692veb.130.2013.10.31.04.09.50 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 31 Oct 2013 04:09:50 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.41 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.41; Received: by mail-vb0-f41.google.com with SMTP id w8so1819842vbj.28 for ; Thu, 31 Oct 2013 04:09:50 -0700 (PDT) X-Received: by 10.58.168.205 with SMTP id zy13mr1480092veb.19.1383217790643; Thu, 31 Oct 2013 04:09:50 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp352587vcz; Thu, 31 Oct 2013 04:09:50 -0700 (PDT) X-Received: by 10.66.162.136 with SMTP id ya8mr1272476pab.110.1383217788626; Thu, 31 Oct 2013 04:09:48 -0700 (PDT) Received: from mail-pb0-f47.google.com (mail-pb0-f47.google.com [209.85.160.47]) by mx.google.com with ESMTPS id ba2si922838pbc.328.2013.10.31.04.09.48 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 31 Oct 2013 04:09:48 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.160.47 is neither permitted nor denied by best guess record for domain of tushar.behera@linaro.org) client-ip=209.85.160.47; Received: by mail-pb0-f47.google.com with SMTP id rq2so2637637pbb.20 for ; Thu, 31 Oct 2013 04:09:48 -0700 (PDT) X-Received: by 10.66.123.5 with SMTP id lw5mr1270869pab.83.1383217788225; Thu, 31 Oct 2013 04:09:48 -0700 (PDT) Received: from linaro.sisodomain.com ([115.113.119.130]) by mx.google.com with ESMTPSA id hz10sm3446333pbc.36.2013.10.31.04.09.45 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 31 Oct 2013 04:09:47 -0700 (PDT) From: Tushar Behera To: linux-kernel@vger.kernel.org Cc: patches@linaro.org, linux-doc@vger.kernel.org, Rob Landley , Greg Kroah-Hartman Subject: [PATCH 5/5] lib: devres: Remove deprecated devm_request_and_ioremap Date: Thu, 31 Oct 2013 16:38:07 +0530 Message-Id: <1383217687-12037-6-git-send-email-tushar.behera@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1383217687-12037-1-git-send-email-tushar.behera@linaro.org> References: <1383217687-12037-1-git-send-email-tushar.behera@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: tushar.behera@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.41 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Now that all the users of devm_request_and_ioremap have been converted to use devm_ioremap_resource, remove the definition. Also remove the entries from Documentation. Signed-off-by: Tushar Behera CC: linux-doc@vger.kernel.org CC: Rob Landley CC: Greg Kroah-Hartman --- Documentation/driver-model/devres.txt | 1 - include/linux/device.h | 2 -- lib/devres.c | 28 ---------------------------- 3 files changed, 31 deletions(-) diff --git a/Documentation/driver-model/devres.txt b/Documentation/driver-model/devres.txt index 5bdc8cb..7de1a54 100644 --- a/Documentation/driver-model/devres.txt +++ b/Documentation/driver-model/devres.txt @@ -273,7 +273,6 @@ IOMAP devm_ioremap_nocache() devm_iounmap() devm_ioremap_resource() : checks resource, requests memory region, ioremaps - devm_request_and_ioremap() : obsoleted by devm_ioremap_resource() pcim_iomap() pcim_iounmap() pcim_iomap_table() : array of mapped addresses indexed by BAR diff --git a/include/linux/device.h b/include/linux/device.h index 5e44cff..54d74cf 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -628,8 +628,6 @@ static inline void *devm_kcalloc(struct device *dev, extern void devm_kfree(struct device *dev, void *p); void __iomem *devm_ioremap_resource(struct device *dev, struct resource *res); -void __iomem *devm_request_and_ioremap(struct device *dev, - struct resource *res); /* allows to add/remove a custom action to devres stack */ int devm_add_action(struct device *dev, void (*action)(void *), void *data); diff --git a/lib/devres.c b/lib/devres.c index 8235331..3ddb56d 100644 --- a/lib/devres.c +++ b/lib/devres.c @@ -140,34 +140,6 @@ void __iomem *devm_ioremap_resource(struct device *dev, struct resource *res) } EXPORT_SYMBOL(devm_ioremap_resource); -/** - * devm_request_and_ioremap() - Check, request region, and ioremap resource - * @dev: Generic device to handle the resource for - * @res: resource to be handled - * - * Takes all necessary steps to ioremap a mem resource. Uses managed device, so - * everything is undone on driver detach. Checks arguments, so you can feed - * it the result from e.g. platform_get_resource() directly. Returns the - * remapped pointer or NULL on error. Usage example: - * - * res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - * base = devm_request_and_ioremap(&pdev->dev, res); - * if (!base) - * return -EADDRNOTAVAIL; - */ -void __iomem *devm_request_and_ioremap(struct device *device, - struct resource *res) -{ - void __iomem *dest_ptr; - - dest_ptr = devm_ioremap_resource(device, res); - if (IS_ERR(dest_ptr)) - return NULL; - - return dest_ptr; -} -EXPORT_SYMBOL(devm_request_and_ioremap); - #ifdef CONFIG_HAS_IOPORT /* * Generic iomap devres