Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f92f471 authored by Randy Dunlap's avatar Randy Dunlap Committed by Linus Torvalds
Browse files

cciss: fix DEBUG printk formats 



Fix printk format warnings when CCISS_DEBUG is defined.

drivers/block/cciss.c:2856: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'
drivers/block/cciss.c:3205: warning: format '%x' expects type 'unsigned int', but argument 2 has type 'long unsigned int'
drivers/block/cciss.c:3236: warning: format '%x' expects type 'unsigned int', but argument 2 has type '__u64'
drivers/block/cciss.c:3246: warning: format '%x' expects type 'unsigned int', but argument 2 has type '__u64'

Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
Cc: Mike Miller <mike.miller@hp.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 06b0d4dc

drivers/block/cciss.c

+5 −4
Original line number Diff line number Diff line
@@ -2847,7 +2847,7 @@ static void do_cciss_request(struct request_queue *q) 
		h->maxSG = seg;



#ifdef CCISS_DEBUG

	printk(KERN_DEBUG "cciss: Submitting %d sectors in %d segments\n",

	printk(KERN_DEBUG "cciss: Submitting %lu sectors in %d segments\n",

	       creq->nr_sectors, seg);

#endif				/* CCISS_DEBUG */
@@ -3197,7 +3197,7 @@ static int __devinit cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev) 


	c->paddr = pci_resource_start(pdev, 0);	/* addressing mode bits already removed */

#ifdef CCISS_DEBUG

	printk("address 0 = %x\n", c->paddr);

	printk("address 0 = %lx\n", c->paddr);

#endif				/* CCISS_DEBUG */

	c->vaddr = remap_pci_mem(c->paddr, 0x250);
@@ -3224,7 +3224,8 @@ static int __devinit cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev) 
#endif				/* CCISS_DEBUG */

	cfg_base_addr_index = find_PCI_BAR_index(pdev, cfg_base_addr);

#ifdef CCISS_DEBUG

	printk("cfg base address index = %x\n", cfg_base_addr_index);

	printk("cfg base address index = %llx\n",

		(unsigned long long)cfg_base_addr_index);

#endif				/* CCISS_DEBUG */

	if (cfg_base_addr_index == -1) {

		printk(KERN_WARNING "cciss: Cannot find cfg_base_addr_index\n");
@@ -3234,7 +3235,7 @@ static int __devinit cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev) 


	cfg_offset = readl(c->vaddr + SA5_CTMEM_OFFSET);

#ifdef CCISS_DEBUG

	printk("cfg offset = %x\n", cfg_offset);

	printk("cfg offset = %llx\n", (unsigned long long)cfg_offset);

#endif				/* CCISS_DEBUG */

	c->cfgtable = remap_pci_mem(pci_resource_start(pdev,

						       cfg_base_addr_index) +