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 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
ata
/
ahci_st.c
diff --git
a/drivers/ata/ahci_st.c
b/drivers/ata/ahci_st.c
index 2595598df9ce6ff955b5e5471141ba54128dcd02..835d6eea84fdc3501bd16af13acea6bba1873f74 100644
(file)
--- a/
drivers/ata/ahci_st.c
+++ b/
drivers/ata/ahci_st.c
@@
-166,7
+166,7
@@
static int st_ahci_probe(struct platform_device *pdev)
if (err)
return err;
if (err)
return err;
- err = ahci_platform_init_host(pdev, hpriv, &st_ahci_port_info
, 0, 0, 0
);
+ err = ahci_platform_init_host(pdev, hpriv, &st_ahci_port_info);
if (err) {
ahci_platform_disable_resources(hpriv);
return err;
if (err) {
ahci_platform_disable_resources(hpriv);
return err;
@@
-221,7
+221,7
@@
static int st_ahci_resume(struct device *dev)
static SIMPLE_DEV_PM_OPS(st_ahci_pm_ops, st_ahci_suspend, st_ahci_resume);
static SIMPLE_DEV_PM_OPS(st_ahci_pm_ops, st_ahci_suspend, st_ahci_resume);
-static struct of_device_id st_ahci_match[] = {
+static
const
struct of_device_id st_ahci_match[] = {
{ .compatible = "st,ahci", },
{},
};
{ .compatible = "st,ahci", },
{},
};