From patchwork Thu Jun 19 18:49:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 32246 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ve0-f197.google.com (mail-ve0-f197.google.com [209.85.128.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id BF5EA206A0 for ; Thu, 19 Jun 2014 18:49:51 +0000 (UTC) Received: by mail-ve0-f197.google.com with SMTP id jz11sf8826727veb.8 for ; Thu, 19 Jun 2014 11:49: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:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=cz9+8z8oZtfm50UWg2Ce5wm5TMU3AN6pZOpz+2EdwiI=; b=j4PwXCoQ7ddraLO6XkXYN1S75EXLyQSKG5+mkhCjc7dvq0E/zH7pi3gaVRi8hFkBvI D0W/3yuZRAgCwbuLxVhb7k7AlCJWWvbAw6/vS8bGgd9RpjqrGgdJ8lebXFTgCjxWUCWR PdtCFjinEvClI6JHuXS3LbLMLCBRAQQtkNHFJ9S8XMGot6L3+5fcHwSDqnS7ajVd+fwZ MXd8BntW032EamlHYnZO/eBdNMY0kiWSa8hfUFflS8don4qUqmfxOmepDAteb8KY7uMG 4eg7q4ZzoMhs3ZPoCgvI3AWoGfXwy0XKOb2B2W0OKr1BUTG/TMziT9lzCmg8VvrWIQfV Ugrw== X-Gm-Message-State: ALoCoQnFaBmVGHQv+B+73AE47jHe3x8NL41Qi2RdZy+i13IJpen9JTYH8vURVRNhKpwGIWLvi6YP X-Received: by 10.58.41.33 with SMTP id c1mr3059124vel.2.1403203791409; Thu, 19 Jun 2014 11:49:51 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.81.72 with SMTP id e66ls684709qgd.24.gmail; Thu, 19 Jun 2014 11:49:51 -0700 (PDT) X-Received: by 10.58.211.229 with SMTP id nf5mr5280708vec.19.1403203791291; Thu, 19 Jun 2014 11:49:51 -0700 (PDT) Received: from mail-vc0-f175.google.com (mail-vc0-f175.google.com [209.85.220.175]) by mx.google.com with ESMTPS id su5si2821191vec.27.2014.06.19.11.49.51 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 19 Jun 2014 11:49:51 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.175 as permitted sender) client-ip=209.85.220.175; Received: by mail-vc0-f175.google.com with SMTP id hy4so2602784vcb.20 for ; Thu, 19 Jun 2014 11:49:51 -0700 (PDT) X-Received: by 10.58.186.207 with SMTP id fm15mr5528754vec.4.1403203791131; Thu, 19 Jun 2014 11:49:51 -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.221.54.6 with SMTP id vs6csp383166vcb; Thu, 19 Jun 2014 11:49:50 -0700 (PDT) X-Received: by 10.68.129.68 with SMTP id nu4mr7926114pbb.76.1403203790430; Thu, 19 Jun 2014 11:49:50 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id uk3si6804944pab.233.2014.06.19.11.49.49; Thu, 19 Jun 2014 11:49:49 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934324AbaFSSte (ORCPT + 5 others); Thu, 19 Jun 2014 14:49:34 -0400 Received: from sauhun.de ([89.238.76.85]:37042 "EHLO pokefinder.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934259AbaFSStb (ORCPT ); Thu, 19 Jun 2014 14:49:31 -0400 Received: from p4fe25d7c.dip0.t-ipconnect.de ([79.226.93.124]:40284 helo=localhost) by pokefinder.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1WxhOq-0003cW-OC; Thu, 19 Jun 2014 20:49:28 +0200 From: Wolfram Sang To: linux-kernel@vger.kernel.org Cc: Tushar Behera , Wolfram Sang , Randy Dunlap , linux-doc@vger.kernel.org Subject: [PATCH 3/3] lib: devres: Remove deprecated devm_request_and_ioremap Date: Thu, 19 Jun 2014 20:49:01 +0200 Message-Id: <1403203741-5113-4-git-send-email-wsa@the-dreams.de> X-Mailer: git-send-email 2.0.0 In-Reply-To: <1403203741-5113-1-git-send-email-wsa@the-dreams.de> References: <1403203741-5113-1-git-send-email-wsa@the-dreams.de> 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: wsa@the-dreams.de X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.175 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: , From: Tushar Behera Now that all the users of devm_request_and_ioremap have been converted to use devm_ioremap_resource, remove it. Also remove the entries from Documentation. Signed-off-by: Tushar Behera Signed-off-by: Wolfram Sang --- 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 1525e30483fd..de6bc8c325e9 100644 --- a/Documentation/driver-model/devres.txt +++ b/Documentation/driver-model/devres.txt @@ -278,7 +278,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 af424acd393d..921fa0a74df6 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -631,8 +631,6 @@ extern unsigned long devm_get_free_pages(struct device *dev, extern void devm_free_pages(struct device *dev, unsigned long addr); 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 f562bf6ff71d..6a4aee8a3a7e 100644 --- a/lib/devres.c +++ b/lib/devres.c @@ -142,34 +142,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 *dev, - struct resource *res) -{ - void __iomem *dest_ptr; - - dest_ptr = devm_ioremap_resource(dev, res); - if (IS_ERR(dest_ptr)) - return NULL; - - return dest_ptr; -} -EXPORT_SYMBOL(devm_request_and_ioremap); - #ifdef CONFIG_HAS_IOPORT_MAP /* * Generic iomap devres