Commit bd1d5ec6 authored by Andrew Morton's avatar Andrew Morton Committed by Jeff Garzik

ata: printk warning fixes

drivers/ata/libata-core.c: In function 'ata_hpa_resize':
drivers/ata/libata-core.c:986: warning: format '%lld' expects type 'long long int', but argument 5 has type 'u64'
drivers/ata/libata-core.c:986: warning: format '%lld' expects type 'long long int', but argument 6 has type 'u64'
drivers/ata/libata-core.c:990: warning: format '%lld' expects type 'long long int', but argument 4 has type 'u64'
drivers/ata/libata-core.c:990: warning: format '%lld' expects type 'long long int', but argument 5 has type 'u64'
drivers/ata/libata-core.c:1003: warning: format '%lld' expects type 'long long int', but argument 4 has type 'u64'

Also fix various 80-col bustage.

Cc: Jeff Garzik <jeff@garzik.org>
Cc: Tejun Heo <htejun@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 0d64a233
...@@ -982,25 +982,28 @@ static u64 ata_hpa_resize(struct ata_device *dev) ...@@ -982,25 +982,28 @@ static u64 ata_hpa_resize(struct ata_device *dev)
hpa_sectors = ata_read_native_max_address(dev); hpa_sectors = ata_read_native_max_address(dev);
/* if no hpa, both should be equal */ /* if no hpa, both should be equal */
ata_dev_printk(dev, KERN_INFO, "%s 1: sectors = %lld, hpa_sectors = %lld\n", ata_dev_printk(dev, KERN_INFO, "%s 1: sectors = %lld, "
__FUNCTION__, sectors, hpa_sectors); "hpa_sectors = %lld\n",
__FUNCTION__, (long long)sectors, (long long)hpa_sectors);
if (hpa_sectors > sectors) { if (hpa_sectors > sectors) {
ata_dev_printk(dev, KERN_INFO, ata_dev_printk(dev, KERN_INFO,
"Host Protected Area detected:\n" "Host Protected Area detected:\n"
"\tcurrent size: %lld sectors\n" "\tcurrent size: %lld sectors\n"
"\tnative size: %lld sectors\n", "\tnative size: %lld sectors\n",
sectors, hpa_sectors); (long long)sectors, (long long)hpa_sectors);
if (ata_ignore_hpa) { if (ata_ignore_hpa) {
if (ata_id_has_lba48(dev->id)) if (ata_id_has_lba48(dev->id))
hpa_sectors = ata_set_native_max_address_ext(dev, hpa_sectors); hpa_sectors = ata_set_native_max_address_ext(dev, hpa_sectors);
else else
hpa_sectors = ata_set_native_max_address(dev, hpa_sectors); hpa_sectors = ata_set_native_max_address(dev,
hpa_sectors);
if (hpa_sectors) { if (hpa_sectors) {
ata_dev_printk(dev, KERN_INFO, ata_dev_printk(dev, KERN_INFO, "native size "
"native size increased to %lld sectors\n", hpa_sectors); "increased to %lld sectors\n",
(long long)hpa_sectors);
return hpa_sectors; return hpa_sectors;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment