projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
ata
/
pata_of_platform.c
diff --git
a/drivers/ata/pata_of_platform.c
b/drivers/ata/pata_of_platform.c
index 1654dc27e7f8365c104d5c6b1523d88c3927d266..e5b234c370fa8d3482cc748409ea863b6561a2f5 100644
(file)
--- a/
drivers/ata/pata_of_platform.c
+++ b/
drivers/ata/pata_of_platform.c
@@
-14,6
+14,7
@@
#include <linux/of_address.h>
#include <linux/platform_device.h>
#include <linux/ata_platform.h>
#include <linux/of_address.h>
#include <linux/platform_device.h>
#include <linux/ata_platform.h>
+#include <linux/libata.h>
static int __devinit pata_of_platform_probe(struct platform_device *ofdev)
{
static int __devinit pata_of_platform_probe(struct platform_device *ofdev)
{
@@
-76,11
+77,6
@@
static int __devinit pata_of_platform_probe(struct platform_device *ofdev)
reg_shift, pio_mask);
}
reg_shift, pio_mask);
}
-static int __devexit pata_of_platform_remove(struct platform_device *ofdev)
-{
- return __pata_platform_remove(&ofdev->dev);
-}
-
static struct of_device_id pata_of_platform_match[] = {
{ .compatible = "ata-generic", },
{ .compatible = "electra-ide", },
static struct of_device_id pata_of_platform_match[] = {
{ .compatible = "ata-generic", },
{ .compatible = "electra-ide", },
@@
-95,7
+91,7
@@
static struct platform_driver pata_of_platform_driver = {
.of_match_table = pata_of_platform_match,
},
.probe = pata_of_platform_probe,
.of_match_table = pata_of_platform_match,
},
.probe = pata_of_platform_probe,
- .remove =
__devexit_p(pata_of_platform_remove)
,
+ .remove =
ata_platform_remove_one
,
};
module_platform_driver(pata_of_platform_driver);
};
module_platform_driver(pata_of_platform_driver);