Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
libata: correct handling of TSS DVD
[libata] core checkpatch fix
[libata] pata_bf54x: checkpatch fixes
libata fixes for sparse-found problems
+14
-19
+3
-1
drivers/ata/libata-core.c
+3
-1
drivers/ata/libata-core.c
···
6998
6998
rc = ap->ops->port_start(ap);
6999
6999
if (rc) {
7000
7000
if (rc != -ENODEV)
7001
-
dev_printk(KERN_ERR, host->dev, "failed to start port %d (errno=%d)\n", i, rc);
7001
+
dev_printk(KERN_ERR, host->dev,
7002
+
"failed to start port %d "
7003
+
"(errno=%d)\n", i, rc);
7002
7004
goto err_out;
7003
7005
}
7004
7006
}
+2
-1
drivers/ata/pata_bf54x.c
+2
-1
drivers/ata/pata_bf54x.c
···
1509
1509
if (res == NULL)
1510
1510
return -EINVAL;
1511
1511
1512
-
while (bfin_port_info[board_idx].udma_mask>0 && udma_fsclk[udma_mode] > fsclk) {
1512
+
while (bfin_port_info[board_idx].udma_mask > 0 &&
1513
+
udma_fsclk[udma_mode] > fsclk) {
1513
1514
udma_mode--;
1514
1515
bfin_port_info[board_idx].udma_mask >>= 1;
1515
1516
}
+3
-5
drivers/ata/pata_legacy.c
+3
-5
drivers/ata/pata_legacy.c
···
271
271
ioread32_rep(ap->ioaddr.data_addr, buf, buflen >> 2);
272
272
273
273
if (unlikely(slop)) {
274
-
u32 pad;
274
+
__le32 pad = 0;
275
275
if (write_data) {
276
276
memcpy(&pad, buf + buflen - slop, slop);
277
-
pad = le32_to_cpu(pad);
278
-
iowrite32(pad, ap->ioaddr.data_addr);
277
+
iowrite32(le32_to_cpu(pad), ap->ioaddr.data_addr);
279
278
} else {
280
-
pad = ioread32(ap->ioaddr.data_addr);
281
-
pad = cpu_to_le16(pad);
279
+
pad = cpu_to_le32(ioread32(ap->ioaddr.data_addr));
282
280
memcpy(buf + buflen - slop, &pad, slop);
283
281
}
284
282
}
+3
-5
drivers/ata/pata_qdi.c
+3
-5
drivers/ata/pata_qdi.c
···
136
136
ioread32_rep(ap->ioaddr.data_addr, buf, buflen >> 2);
137
137
138
138
if (unlikely(slop)) {
139
-
u32 pad;
139
+
__le32 pad = 0;
140
140
if (write_data) {
141
141
memcpy(&pad, buf + buflen - slop, slop);
142
-
pad = le32_to_cpu(pad);
143
-
iowrite32(pad, ap->ioaddr.data_addr);
142
+
iowrite32(le32_to_cpu(pad), ap->ioaddr.data_addr);
144
143
} else {
145
-
pad = ioread32(ap->ioaddr.data_addr);
146
-
pad = cpu_to_le32(pad);
144
+
pad = cpu_to_le32(ioread32(ap->ioaddr.data_addr));
147
145
memcpy(buf + buflen - slop, &pad, slop);
148
146
}
149
147
}
+3
-5
drivers/ata/pata_winbond.c
+3
-5
drivers/ata/pata_winbond.c
···
104
104
ioread32_rep(ap->ioaddr.data_addr, buf, buflen >> 2);
105
105
106
106
if (unlikely(slop)) {
107
-
u32 pad;
107
+
__le32 pad = 0;
108
108
if (write_data) {
109
109
memcpy(&pad, buf + buflen - slop, slop);
110
-
pad = le32_to_cpu(pad);
111
-
iowrite32(pad, ap->ioaddr.data_addr);
110
+
iowrite32(le32_to_cpu(pad), ap->ioaddr.data_addr);
112
111
} else {
113
-
pad = ioread32(ap->ioaddr.data_addr);
114
-
pad = cpu_to_le16(pad);
112
+
pad = cpu_to_le32(ioread32(ap->ioaddr.data_addr));
115
113
memcpy(buf + buflen - slop, &pad, slop);
116
114
}
117
115
}