Skip to content

Commit

Permalink
pata_mpc52xx: utilize common ata_platform_remove_one()
Browse files Browse the repository at this point in the history
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
  • Loading branch information
Brian Norris authored and Jeff Garzik committed Dec 3, 2012
1 parent 58d0ff2 commit 37e1b02
Showing 1 changed file with 3 additions and 14 deletions.
17 changes: 3 additions & 14 deletions drivers/ata/pata_mpc52xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
/* ======================================================================== */
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 37e1b02

Please sign in to comment.