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

Commit 26b7625c authored by Andrew Morton's avatar Andrew Morton Committed by Jeff Garzik
Browse files

[PATCH] git-netdev-all: s2io warning fix 



drivers/net/s2io.c: In function `s2io_txdl_getskb':
drivers/net/s2io.c:2023: warning: cast from pointer to integer of different size
drivers/net/s2io.c: In function `s2io_open':
drivers/net/s2io.c:3325: warning: long long unsigned int format, u64 arg (arg 3)
drivers/net/s2io.c:3333: warning: long long unsigned int format, u64 arg (arg 3)
drivers/net/s2io.c: In function `s2io_eeprom_test':
drivers/net/s2io.c:4749: warning: long long unsigned int format, long unsigned int arg (arg 3)
drivers/net/s2io.c:4749: warning: long long unsigned int format, u64 arg (arg 4)
drivers/net/s2io.c:4768: warning: long long unsigned int format, long unsigned int arg (arg 3)
drivers/net/s2io.c:4768: warning: long long unsigned int format, u64 arg (arg 4)

I had to update this patch because more warnings have just appeared.

You cannot print a u64 with %l or %ll.  You do not know what type the
architecture is using.  It must be cast to a type which matches the printf
control string - unsigned long long.

The patch also fixes some overly-long strings.  Please try to keep the code
looking neat in an 80-col window.

Cc: Jeff Garzik <jgarzik@pobox.com>
Cc: Ananda Raju <Ananda.Raju@neterion.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent f15943f5

drivers/net/s2io.c

+11 −5
Original line number Original line Diff line number Diff line
@@ -2020,7 +2020,7 @@ static struct sk_buff *s2io_txdl_getskb(fifo_info_t *fifo_data, TxD_t *txdlp, in 
	u16 j, frg_cnt;

	u16 j, frg_cnt;





	txds = txdlp;

	txds = txdlp;

	if (txds->Host_Control == (u64) nic->ufo_in_band_v) {

	if (txds->Host_Control == (u64)(long)nic->ufo_in_band_v) {

		pci_unmap_single(nic->pdev, (dma_addr_t)

		pci_unmap_single(nic->pdev, (dma_addr_t)

			txds->Buffer_Pointer, sizeof(u64),

			txds->Buffer_Pointer, sizeof(u64),

			PCI_DMA_TODEVICE);

			PCI_DMA_TODEVICE);
@@ -3323,7 +3323,7 @@ failed\n", dev->name); 
					  s2io_msix_fifo_handle, 0, sp->desc1,

					  s2io_msix_fifo_handle, 0, sp->desc1,

					  sp->s2io_entries[i].arg);

					  sp->s2io_entries[i].arg);

				DBG_PRINT(ERR_DBG, "%s @ 0x%llx\n", sp->desc1, 

				DBG_PRINT(ERR_DBG, "%s @ 0x%llx\n", sp->desc1, 

							sp->msix_info[i].addr);

				    (unsigned long long)sp->msix_info[i].addr);

			} else {

			} else {

				sprintf(sp->desc2, "%s:MSI-X-%d-RX",

				sprintf(sp->desc2, "%s:MSI-X-%d-RX",

					dev->name, i);

					dev->name, i);
@@ -3331,7 +3331,7 @@ failed\n", dev->name); 
					  s2io_msix_ring_handle, 0, sp->desc2,

					  s2io_msix_ring_handle, 0, sp->desc2,

					  sp->s2io_entries[i].arg);

					  sp->s2io_entries[i].arg);

				DBG_PRINT(ERR_DBG, "%s @ 0x%llx\n", sp->desc2, 

				DBG_PRINT(ERR_DBG, "%s @ 0x%llx\n", sp->desc2, 

							sp->msix_info[i].addr);

				     (unsigned long long)sp->msix_info[i].addr);

			}

			}

			if (err) {

			if (err) {

				DBG_PRINT(ERR_DBG, "%s: MSI-X-%d registration \

				DBG_PRINT(ERR_DBG, "%s: MSI-X-%d registration \
@@ -4746,7 +4746,10 @@ static int s2io_eeprom_test(nic_t * sp, uint64_t * data) 
		fail = 1;

		fail = 1;





	if (ret_data != 0x012345) {

	if (ret_data != 0x012345) {

		DBG_PRINT(ERR_DBG, "%s: eeprom test error at offset 0x4F0. Data written %llx Data read %llx\n", dev->name, (u64)0x12345, ret_data); 

		DBG_PRINT(ERR_DBG, "%s: eeprom test error at offset 0x4F0. "

			"Data written %llx Data read %llx\n",

			dev->name, (unsigned long long)0x12345,

			(unsigned long long)ret_data);

		fail = 1;

		fail = 1;

	}

	}
@@ -4765,7 +4768,10 @@ static int s2io_eeprom_test(nic_t * sp, uint64_t * data) 
		fail = 1;

		fail = 1;





	if (ret_data != 0x012345) {

	if (ret_data != 0x012345) {

		DBG_PRINT(ERR_DBG, "%s: eeprom test error at offset 0x7F0. Data written %llx Data read %llx\n", dev->name, (u64)0x12345, ret_data); 

		DBG_PRINT(ERR_DBG, "%s: eeprom test error at offset 0x7F0. "

			"Data written %llx Data read %llx\n",

			dev->name, (unsigned long long)0x12345,

			(unsigned long long)ret_data);

		fail = 1;

		fail = 1;

	}

	}