From 035aaabeefbcf5f6ad5d5b2a2c4ec5932e4fec19 Mon Sep 17 00:00:00 2001 From: Brian Norris Date: Fri, 2 Nov 2012 00:46:19 -0700 Subject: [PATCH] --- yaml --- r: 344426 b: refs/heads/master c: 83291d65cbeadda2bd600b6c500df7046dcd6fa9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/ata/ahci_platform.c | 12 +----------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index 3b41f8f9fd38..36d3b46eeda3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b7db04d9264fca4b00e949da7b3180c50e243fca +refs/heads/master: 83291d65cbeadda2bd600b6c500df7046dcd6fa9 diff --git a/trunk/drivers/ata/ahci_platform.c b/trunk/drivers/ata/ahci_platform.c index 5aa4309d4481..1d90690d85f7 100644 --- a/trunk/drivers/ata/ahci_platform.c +++ b/trunk/drivers/ata/ahci_platform.c @@ -229,16 +229,6 @@ static int __devinit ahci_probe(struct platform_device *pdev) return rc; } -static int __devexit ahci_remove(struct platform_device *pdev) -{ - struct device *dev = &pdev->dev; - struct ata_host *host = dev_get_drvdata(dev); - - ata_host_detach(host); - - return 0; -} - static void ahci_host_stop(struct ata_host *host) { struct device *dev = host->dev; @@ -343,7 +333,7 @@ MODULE_DEVICE_TABLE(of, ahci_of_match); static struct platform_driver ahci_driver = { .probe = ahci_probe, - .remove = __devexit_p(ahci_remove), + .remove = ata_platform_remove_one, .driver = { .name = "ahci", .owner = THIS_MODULE,