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 tag 'module-misc-v4.1-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
ata
/
pata_hpt366.c
diff --git
a/drivers/ata/pata_hpt366.c
b/drivers/ata/pata_hpt366.c
index cbc3de793d1d61a494cb82fe76e6a16ebfb8ab5b..0038dc4c06c7dbd89b7cef8f424f374fc250da42 100644
(file)
--- a/
drivers/ata/pata_hpt366.c
+++ b/
drivers/ata/pata_hpt366.c
@@
-352,7
+352,7
@@
static int hpt36x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
};
const struct ata_port_info *ppi[] = { &info_hpt366, NULL };
};
const struct ata_port_info *ppi[] = { &info_hpt366, NULL };
- void *hpriv = NULL;
+
const
void *hpriv = NULL;
u32 reg1;
int rc;
u32 reg1;
int rc;
@@
-383,7
+383,7
@@
static int hpt36x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
break;
}
/* Now kick off ATA set up */
break;
}
/* Now kick off ATA set up */
- return ata_pci_bmdma_init_one(dev, ppi, &hpt36x_sht, hpriv, 0);
+ return ata_pci_bmdma_init_one(dev, ppi, &hpt36x_sht,
(void *)
hpriv, 0);
}
#ifdef CONFIG_PM_SLEEP
}
#ifdef CONFIG_PM_SLEEP