From patchwork Mon Jun 10 11:35:13 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tushar Behera X-Patchwork-Id: 17732 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ye0-f199.google.com (mail-ye0-f199.google.com [209.85.213.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 3381725DF9 for ; Mon, 10 Jun 2013 11:50:55 +0000 (UTC) Received: by mail-ye0-f199.google.com with SMTP id l8sf2709162yen.2 for ; Mon, 10 Jun 2013 04:50:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-beenthere:x-forwarded-to:x-forwarded-for :delivered-to:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=cDnKfjr0cFe5noj4p5Y/+78s5F7mnQk/zD+ZPVFIXBk=; b=px4Nu6RzSg8b9PI7cGGi4bNavra8rf2hvuzSEpvVXps1u8/sxvRt6WOF3jLZ91j7I1 xjn1mdmJiE1Uad9FIPvCnzII9xGSV4DbeeBU8AuDUZjlJHdbgyoclotqiULgSHRxmmn7 CblOulDzv3gZmuqXXuvNddbvXQziDX+rTg6bLMdaW3EC626JeP6tkqXt4C9ScxBu0gAR j8Tke+sSiI1F2IvGUkBVqfy0qW/a8zvBCRnjuTy/2WzClPiXiXt9n2CXgx41+YNg5z7n FgTInX29UusKv7PTWgB7DFuBXDAEnt1BDKhHE9aF3EPDBmn7gmL2TTXctH/64iYZ2ISp E7WQ== X-Received: by 10.224.174.145 with SMTP id t17mr8261924qaz.4.1370865054654; Mon, 10 Jun 2013 04:50:54 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.110.194 with SMTP id ic2ls2729466qeb.36.gmail; Mon, 10 Jun 2013 04:50:54 -0700 (PDT) X-Received: by 10.52.115.42 with SMTP id jl10mr4558394vdb.39.1370865054455; Mon, 10 Jun 2013 04:50:54 -0700 (PDT) Received: from mail-vc0-f182.google.com (mail-vc0-f182.google.com [209.85.220.182]) by mx.google.com with ESMTPS id zt2si4690874vdb.128.2013.06.10.04.50.54 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 10 Jun 2013 04:50:54 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.182 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.182; Received: by mail-vc0-f182.google.com with SMTP id gf12so4310150vcb.41 for ; Mon, 10 Jun 2013 04:50:54 -0700 (PDT) X-Received: by 10.58.97.238 with SMTP id ed14mr1115422veb.34.1370865054335; Mon, 10 Jun 2013 04:50:54 -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.221.10.206 with SMTP id pb14csp64995vcb; Mon, 10 Jun 2013 04:50:53 -0700 (PDT) X-Received: by 10.66.145.201 with SMTP id sw9mr13614461pab.63.1370865053407; Mon, 10 Jun 2013 04:50:53 -0700 (PDT) Received: from mail-pd0-f171.google.com (mail-pd0-f171.google.com [209.85.192.171]) by mx.google.com with ESMTPS id pt5si6790755pac.301.2013.06.10.04.50.53 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 10 Jun 2013 04:50:53 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.192.171 is neither permitted nor denied by best guess record for domain of tushar.behera@linaro.org) client-ip=209.85.192.171; Received: by mail-pd0-f171.google.com with SMTP id y14so4420680pdi.2 for ; Mon, 10 Jun 2013 04:50:53 -0700 (PDT) X-Received: by 10.68.190.196 with SMTP id gs4mr9584491pbc.189.1370865053035; Mon, 10 Jun 2013 04:50:53 -0700 (PDT) Received: from linaro.sisodomain.com ([115.113.119.130]) by mx.google.com with ESMTPSA id rn7sm10242037pbc.12.2013.06.10.04.50.49 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 10 Jun 2013 04:50:52 -0700 (PDT) From: Tushar Behera To: linux-kernel@vger.kernel.org Cc: thierry.reding@gmail.com, patches@linaro.org, linux-doc@vger.kernel.org, Rob Landley , Greg Kroah-Hartman Subject: [PATCH 15/15] lib: devres: Remove deprecated devm_request_and_ioremap Date: Mon, 10 Jun 2013 17:05:13 +0530 Message-Id: <1370864113-17895-16-git-send-email-tushar.behera@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1370864113-17895-1-git-send-email-tushar.behera@linaro.org> References: <1370864113-17895-1-git-send-email-tushar.behera@linaro.org> X-Gm-Message-State: ALoCoQkGTQWFp65mBek8xwOdp6nCtytPTDjgYwGGDNn9Np27O7G2wz/XHvHlKIye25NW+Zwq8Cko X-Original-Sender: tushar.behera@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.182 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 b467145..c085bbb 100644 --- a/Documentation/driver-model/devres.txt +++ b/Documentation/driver-model/devres.txt @@ -267,7 +267,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 eeb3331..ba99ee2 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -580,8 +580,6 @@ extern void *devm_kzalloc(struct device *dev, size_t size, gfp_t gfp); 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