From patchwork Sat Jan 26 01:31:00 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tejun Heo X-Patchwork-Id: 215880 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id D1B972C0080 for ; Sat, 26 Jan 2013 12:32:17 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755128Ab3AZBb3 (ORCPT ); Fri, 25 Jan 2013 20:31:29 -0500 Received: from mail-da0-f52.google.com ([209.85.210.52]:40721 "EHLO mail-da0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755040Ab3AZBbW (ORCPT ); Fri, 25 Jan 2013 20:31:22 -0500 Received: by mail-da0-f52.google.com with SMTP id f10so421976dak.25 for ; Fri, 25 Jan 2013 17:31:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=pG68BNy+CEMmdmFquX1S2Yh9Ri/jDIhr9brz0OLbvHs=; b=kZQK37ldGBZBzQcPav51K/qlcOAuwYNldHdkpABbbw4rYl9UZ+x5sY/EURzVCaCgru 6vZ1DQyFTWVwaUUDTs8jvYiySrdL5fdVjgvLArz+fhb135Dqz3ridv9wUm0et3Nulr90 hoOR9q6anGe7gEcU5dH/Eh5mMfbd0c7z2oztV/vjJ/WwdwAmfznGsJJdaQs70tKZnzeU H9weJz640GbkC+LO7wNlzW76dxP5Jx3GdhqDe49EwpP5xOWQvpMHrYeMoLputWbrVeGU aoLLvRB8meHA4ToBvtrSKqmOhQ7ZebeOWsje+wIkpYD5Rh8BQeNL3jcomkO1D3ihNxk6 OV9g== X-Received: by 10.66.81.231 with SMTP id d7mr17786029pay.27.1359163881725; Fri, 25 Jan 2013 17:31:21 -0800 (PST) Received: from htj.dyndns.org (c-69-181-251-227.hsd1.ca.comcast.net. [69.181.251.227]) by mx.google.com with ESMTPS id qh4sm1627305pbb.9.2013.01.25.17.31.20 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 25 Jan 2013 17:31:20 -0800 (PST) From: Tejun Heo To: akpm@linux-foundation.org Cc: rusty@rustcorp.com.au, linux-kernel@vger.kernel.org, Tejun Heo , Chas Williams , netdev@vger.kernel.org Subject: [PATCH 02/14] atm/nicstar: don't use idr_remove_all() Date: Fri, 25 Jan 2013 17:31:00 -0800 Message-Id: <1359163872-1949-3-git-send-email-tj@kernel.org> X-Mailer: git-send-email 1.8.1 In-Reply-To: <1359163872-1949-1-git-send-email-tj@kernel.org> References: <1359163872-1949-1-git-send-email-tj@kernel.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org idr_destroy() can destroy idr by itself and idr_remove_all() is being deprecated. Drop its usage. Signed-off-by: Tejun Heo Cc: Chas Williams Cc: netdev@vger.kernel.org Acked-by: David S. Miller --- This patch depends on an earlier idr patch and given the trivial nature of the patch, I think it would be best to route these together through -mm. Please holler if there's any objection. Thanks. drivers/atm/nicstar.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c index ed1d2b7..628787e 100644 --- a/drivers/atm/nicstar.c +++ b/drivers/atm/nicstar.c @@ -251,7 +251,6 @@ static void nicstar_remove_one(struct pci_dev *pcidev) if (card->scd2vc[j] != NULL) free_scq(card, card->scd2vc[j]->scq, card->scd2vc[j]->tx_vcc); } - idr_remove_all(&card->idr); idr_destroy(&card->idr); pci_free_consistent(card->pcidev, NS_RSQSIZE + NS_RSQ_ALIGNMENT, card->rsq.org, card->rsq.dma);