Skip to content

Commit

Permalink
ata: printk warning fixes
Browse files Browse the repository at this point in the history
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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
  • Loading branch information
Andrew Morton authored and Jeff Garzik committed Apr 28, 2007
1 parent 0d64a23 commit bd1d5ec
Showing 1 changed file with 9 additions and 6 deletions.
15 changes: 9 additions & 6 deletions drivers/ata/libata-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -982,25 +982,28 @@ static u64 ata_hpa_resize(struct ata_device *dev)
hpa_sectors = ata_read_native_max_address(dev);

/* if no hpa, both should be equal */
ata_dev_printk(dev, KERN_INFO, "%s 1: sectors = %lld, hpa_sectors = %lld\n",
__FUNCTION__, sectors, hpa_sectors);
ata_dev_printk(dev, KERN_INFO, "%s 1: sectors = %lld, "
"hpa_sectors = %lld\n",
__FUNCTION__, (long long)sectors, (long long)hpa_sectors);

if (hpa_sectors > sectors) {
ata_dev_printk(dev, KERN_INFO,
"Host Protected Area detected:\n"
"\tcurrent 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_id_has_lba48(dev->id))
hpa_sectors = ata_set_native_max_address_ext(dev, hpa_sectors);
else
hpa_sectors = ata_set_native_max_address(dev, hpa_sectors);
hpa_sectors = ata_set_native_max_address(dev,
hpa_sectors);

if (hpa_sectors) {
ata_dev_printk(dev, KERN_INFO,
"native size increased to %lld sectors\n", hpa_sectors);
ata_dev_printk(dev, KERN_INFO, "native size "
"increased to %lld sectors\n",
(long long)hpa_sectors);
return hpa_sectors;
}
}
Expand Down

0 comments on commit bd1d5ec

Please sign in to comment.