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 'upstream' of git://git.infradead.org/users/pcmoore/audit
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
ata
/
pata_it821x.c
diff --git
a/drivers/ata/pata_it821x.c
b/drivers/ata/pata_it821x.c
index a5088ecb349f963dee15c89a607e62561558b2d3..7a21edf89e72adb643dfb6fd7ac127e806bdc614 100644
(file)
--- a/
drivers/ata/pata_it821x.c
+++ b/
drivers/ata/pata_it821x.c
@@
-604,9
+604,9
@@
static void it821x_display_disk(int n, u8 *buf)
{
unsigned char id[41];
int mode = 0;
{
unsigned char id[41];
int mode = 0;
- char *mtype = "";
+ c
onst c
har *mtype = "";
char mbuf[8];
char mbuf[8];
- char *cbl = "(40 wire cable)";
+ c
onst c
har *cbl = "(40 wire cable)";
static const char *types[5] = {
"RAID0", "RAID1", "RAID 0+1", "JBOD", "DISK"
static const char *types[5] = {
"RAID0", "RAID1", "RAID 0+1", "JBOD", "DISK"
@@
-903,7
+903,7
@@
static int it821x_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
};
const struct ata_port_info *ppi[] = { NULL, NULL };
};
const struct ata_port_info *ppi[] = { NULL, NULL };
- static char *mode[2] = { "pass through", "smart" };
+ static c
onst c
har *mode[2] = { "pass through", "smart" };
int rc;
rc = pcim_enable_device(pdev);
int rc;
rc = pcim_enable_device(pdev);