38 lines
1.1 KiB
Diff
38 lines
1.1 KiB
Diff
|
--- a/drivers/ata/pata_rbppc_cf.c
|
||
|
|
+++ b/drivers/ata/pata_rbppc_cf.c
|
||
|
|
@@ -15,6 +15,7 @@
|
||
|
|
#include <linux/libata.h>
|
||
|
|
#include <linux/of_platform.h>
|
||
|
|
#include <linux/ata_platform.h>
|
||
|
|
+#include <linux/slab.h>
|
||
|
|
|
||
|
|
#define DEBUG_UPM 0
|
||
|
|
|
||
|
|
@@ -510,7 +511,7 @@ static struct ata_port_operations rbppc_
|
||
|
|
.sff_irq_clear = rbppc_cf_dummy_noret,
|
||
|
|
};
|
||
|
|
|
||
|
|
-static int rbppc_cf_init_info(struct of_device *pdev, struct rbppc_cf_info *info) {
|
||
|
|
+static int rbppc_cf_init_info(struct platform_device *pdev, struct rbppc_cf_info *info) {
|
||
|
|
struct device_node *np;
|
||
|
|
struct resource res;
|
||
|
|
const u32 *u32ptr;
|
||
|
|
@@ -579,7 +580,7 @@ static int rbppc_cf_init_info(struct of_
|
||
|
|
return 0;
|
||
|
|
}
|
||
|
|
|
||
|
|
-static int rbppc_cf_probe(struct of_device *pdev,
|
||
|
|
+static int rbppc_cf_probe(struct platform_device *pdev,
|
||
|
|
const struct of_device_id *match)
|
||
|
|
{
|
||
|
|
struct ata_host *host;
|
||
|
|
@@ -654,7 +655,7 @@ err_info:
|
||
|
|
return err;
|
||
|
|
}
|
||
|
|
|
||
|
|
-static int rbppc_cf_remove(struct of_device *pdev)
|
||
|
|
+static int rbppc_cf_remove(struct platform_device *pdev)
|
||
|
|
{
|
||
|
|
struct device *dev = &pdev->dev;
|
||
|
|
struct ata_host *host = dev_get_drvdata(dev);
|