From patchwork Fri Nov 2 07:46:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 196499 X-Patchwork-Delegate: davem@davemloft.net 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 7E5F12C009F for ; Fri, 2 Nov 2012 18:47:21 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754642Ab2KBHrJ (ORCPT ); Fri, 2 Nov 2012 03:47:09 -0400 Received: from mail-da0-f46.google.com ([209.85.210.46]:43309 "EHLO mail-da0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754036Ab2KBHq7 (ORCPT ); Fri, 2 Nov 2012 03:46:59 -0400 Received: by mail-da0-f46.google.com with SMTP id n41so1546133dak.19 for ; Fri, 02 Nov 2012 00:46:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=IvkhEwFeCUivaRXlOX3urX6mWkrHVC+LNFqlcesgtOA=; b=ATBSzM4JCeNrvBxdgvGpWV2rXi22nUfERHmCDr5KDC0okuhpe0povTXfCvk/9EWcTh 8o5wxgn2PLZnatf3ZDFekaOjDLFNuw9EpxsceJy7Vx+CkQqJL9gac17Y5hYjpJaz7ad2 P5NG+pWVN02ApW035QNUs9wWTrSj4/mWDie/LCGrnqLZhzL9CMUEDpiG3Gj7ZkYyGf5Q jGCcQ/UJA8iQl7S9OF3bohQmDlXzRHuE7aHY2pDNDPNVc2KmGL5KDYs9BnTioc27V0qM 3RreAnifLtLajfQEflKYu6EaM0txOD6SQUcBzWbGUh8/Kv4BhuH34YRURuCGzQjeF4ZZ Wa7Q== Received: by 10.66.85.138 with SMTP id h10mr3014986paz.40.1351842418926; Fri, 02 Nov 2012 00:46:58 -0700 (PDT) Received: from ld-irv-0074.broadcom.com (pv141010.reshsg.uci.edu. [169.234.141.10]) by mx.google.com with ESMTPS id is6sm5365133pbc.55.2012.11.02.00.46.57 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 02 Nov 2012 00:46:58 -0700 (PDT) From: Brian Norris To: Jeff Garzik Cc: , Brian Norris , Tejun Heo Subject: [PATCH 07/14] pata_mpc52xx: utilize common ata_platform_remove_one() Date: Fri, 2 Nov 2012 00:46:21 -0700 Message-Id: <1351842388-27210-8-git-send-email-computersforpeace@gmail.com> X-Mailer: git-send-email 1.7.11.3 In-Reply-To: <1351842388-27210-1-git-send-email-computersforpeace@gmail.com> References: <1351842388-27210-1-git-send-email-computersforpeace@gmail.com> Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org Signed-off-by: Brian Norris --- drivers/ata/pata_mpc52xx.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/drivers/ata/pata_mpc52xx.c b/drivers/ata/pata_mpc52xx.c index d2c102f..ec67f54 100644 --- a/drivers/ata/pata_mpc52xx.c +++ b/drivers/ata/pata_mpc52xx.c @@ -663,18 +663,6 @@ mpc52xx_ata_init_one(struct device *dev, struct mpc52xx_ata_priv *priv, &mpc52xx_ata_sht); } -static struct mpc52xx_ata_priv * -mpc52xx_ata_remove_one(struct device *dev) -{ - struct ata_host *host = dev_get_drvdata(dev); - struct mpc52xx_ata_priv *priv = host->private_data; - - ata_host_detach(host); - - return priv; -} - - /* ======================================================================== */ /* OF Platform driver */ /* ======================================================================== */ @@ -815,11 +803,12 @@ mpc52xx_ata_probe(struct platform_device *op) static int mpc52xx_ata_remove(struct platform_device *op) { - struct mpc52xx_ata_priv *priv; + struct ata_host *host = platform_get_drvdata(op); + struct mpc52xx_ata_priv *priv = host->private_data; int task_irq; /* Deregister the ATA interface */ - priv = mpc52xx_ata_remove_one(&op->dev); + ata_platform_remove_one(op); /* Clean up DMA */ task_irq = bcom_get_task_irq(priv->dmatsk);