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

Commit aaa4d308 authored by Jiri Benc's avatar Jiri Benc Committed by Jeff Garzik
Browse files

[PATCH] ieee80211: fix ipw 64bit compilation warnings 



On Mon, 06 Jun 2005 14:29:52 +0800, Zhu Yi wrote:
> ("%zd", sizeof()) should be better.

Thanks. This is a corrected version of the patch.

This patch fixes warnings when compiling ipw2100 and ipw2200 on x86_64.

Signed-off-by: default avatarJiri Benc <jbenc@suse.cz>
Signed-off-by: default avatarJirka Bohac <jbohac@suse.cz>
parent e19b813e

drivers/net/wireless/ipw2100.c

+12 −12
Original line number Diff line number Diff line
@@ -493,7 +493,7 @@ int ipw2100_get_ordinal(struct ipw2100_priv *priv, u32 ord, 
			*len = IPW_ORD_TAB_1_ENTRY_SIZE;



			IPW_DEBUG_WARNING(DRV_NAME

			       ": ordinal buffer length too small, need %d\n",

			       ": ordinal buffer length too small, need %zd\n",

			       IPW_ORD_TAB_1_ENTRY_SIZE);



			return -EINVAL;
@@ -2302,7 +2302,7 @@ static inline void ipw2100_corruption_detected(struct ipw2100_priv *priv, 
#endif



	IPW_DEBUG_INFO(DRV_NAME ": PCI latency error detected at "

		       "0x%04X.\n", i * sizeof(struct ipw2100_status));

		       "0x%04zX.\n", i * sizeof(struct ipw2100_status));



#ifdef ACPI_CSTATE_LIMIT_DEFINED

	IPW_DEBUG_INFO(DRV_NAME ": Disabling C3 transitions.\n");
@@ -2398,7 +2398,7 @@ static inline void isr_rx(struct ipw2100_priv *priv, int i, 
	/* Make a copy of the frame so we can dump it to the logs if

	 * ieee80211_rx fails */

	memcpy(packet_data, packet->skb->data,

	       min(status->frame_size, IPW_RX_NIC_BUFFER_LENGTH));

	       min_t(u32, status->frame_size, IPW_RX_NIC_BUFFER_LENGTH));

#endif



	if (!ieee80211_rx(priv->ieee, packet->skb, stats)) {
@@ -2730,21 +2730,21 @@ static inline int __ipw2100_tx_process(struct ipw2100_priv *priv) 
	{

		int i = txq->oldest;

		IPW_DEBUG_TX(

			"TX%d V=%p P=%p T=%p L=%d\n", i,

			"TX%d V=%p P=%04X T=%04X L=%d\n", i,

			&txq->drv[i],

			(void*)txq->nic + i * sizeof(struct ipw2100_bd),

			(void*)txq->drv[i].host_addr,

			(u32)(txq->nic + i * sizeof(struct ipw2100_bd)),

			txq->drv[i].host_addr,

			txq->drv[i].buf_length);



		if (packet->type == DATA) {

			i = (i + 1) % txq->entries;



			IPW_DEBUG_TX(

				"TX%d V=%p P=%p T=%p L=%d\n", i,

				"TX%d V=%p P=%04X T=%04X L=%d\n", i,

				&txq->drv[i],

				(void*)txq->nic + i *

				sizeof(struct ipw2100_bd),

				(void*)txq->drv[i].host_addr,

				(u32)(txq->nic + i *

				sizeof(struct ipw2100_bd)),

				(u32)txq->drv[i].host_addr,

				txq->drv[i].buf_length);

		}

	}
@@ -4212,7 +4212,7 @@ static void bd_queue_initialize( 
{

	IPW_DEBUG_INFO("enter\n");



	IPW_DEBUG_INFO("initializing bd queue at virt=%p, phys=%08x\n", q->drv, q->nic);

	IPW_DEBUG_INFO("initializing bd queue at virt=%p, phys=%08x\n", q->drv, (u32)q->nic);



	write_register(priv->net_dev, base, q->nic);

	write_register(priv->net_dev, size, q->entries);
@@ -8431,7 +8431,7 @@ int ipw2100_get_firmware(struct ipw2100_priv *priv, struct ipw2100_fw *fw) 
		       priv->net_dev->name, fw_name);

		return rc;

	}

	IPW_DEBUG_INFO("firmware data %p size %d\n", fw->fw_entry->data,

	IPW_DEBUG_INFO("firmware data %p size %zd\n", fw->fw_entry->data,

			   fw->fw_entry->size);



	ipw2100_mod_firmware_load(fw);

drivers/net/wireless/ipw2200.c

+21 −21
Original line number Diff line number Diff line
@@ -241,8 +241,8 @@ static void _ipw_write_reg8(struct ipw_priv *priv, u32 reg, u8 value) 
	IPW_DEBUG_IO(" reg = 0x%8X : value = 0x%8X\n", reg, value);

	_ipw_write32(priv, CX2_INDIRECT_ADDR, reg & CX2_INDIRECT_ADDR_MASK);

	_ipw_write8(priv, CX2_INDIRECT_DATA, value);

	IPW_DEBUG_IO(" reg = 0x%8X : value = 0x%8X\n", 

		     (unsigned)(priv->hw_base + CX2_INDIRECT_DATA),

	IPW_DEBUG_IO(" reg = 0x%8lX : value = 0x%8X\n", 

		     (unsigned long)(priv->hw_base + CX2_INDIRECT_DATA),

		     value);

}
@@ -508,7 +508,7 @@ static int ipw_get_ordinal(struct ipw_priv *priv, u32 ord, void *val, 
		/* verify we have enough room to store the value */

		if (*len < sizeof(u32)) {

			IPW_DEBUG_ORD("ordinal buffer length too small, "

				      "need %d\n", sizeof(u32));

				      "need %zd\n", sizeof(u32));

			return -EINVAL;

		}
@@ -541,7 +541,7 @@ static int ipw_get_ordinal(struct ipw_priv *priv, u32 ord, void *val, 
		/* verify we have enough room to store the value */

		if (*len < sizeof(u32)) {

			IPW_DEBUG_ORD("ordinal buffer length too small, "

				      "need %d\n", sizeof(u32));

				      "need %zd\n", sizeof(u32));

			return -EINVAL;

		}
@@ -1740,7 +1740,7 @@ static int ipw_fw_dma_write_command_block(struct ipw_priv *priv, int index, stru 
	u32 address = CX2_SHARED_SRAM_DMA_CONTROL + (sizeof(struct command_block) * index); 

	IPW_DEBUG_FW(">> :\n");



	ipw_write_indirect(priv, address, (u8*)cb, sizeof(struct command_block));

	ipw_write_indirect(priv, address, (u8*)cb, (int)sizeof(struct command_block));



	IPW_DEBUG_FW("<< :\n");

	return 0;
@@ -2342,7 +2342,7 @@ static int ipw_get_fw(struct ipw_priv *priv, 
		return -EINVAL;

	}



	IPW_DEBUG_INFO("Loading firmware '%s' file v%d.%d (%d bytes)\n",

	IPW_DEBUG_INFO("Loading firmware '%s' file v%d.%d (%zd bytes)\n",

		       name,

		       IPW_FW_MAJOR(header->version),

		       IPW_FW_MINOR(header->version),
@@ -2697,7 +2697,7 @@ static int ipw_queue_tx_init(struct ipw_priv *priv, 


	q->bd = pci_alloc_consistent(dev,sizeof(q->bd[0])*count, &q->q.dma_addr);

	if (!q->bd) {

		IPW_ERROR("pci_alloc_consistent(%d) failed\n",

		IPW_ERROR("pci_alloc_consistent(%zd) failed\n",

				sizeof(q->bd[0]) * count);

		kfree(q->txb);

		q->txb = NULL;
@@ -3466,7 +3466,7 @@ static inline void ipw_rx_notification(struct ipw_priv* priv, 
				       x->channel_num);

		} else {

			IPW_DEBUG_SCAN("Scan result of wrong size %d "

				       "(should be %d)\n",

				       "(should be %zd)\n",

				       notif->size, sizeof(*x));

		}

		break;
@@ -3482,7 +3482,7 @@ static inline void ipw_rx_notification(struct ipw_priv* priv, 
				       x->status);

		} else {

			IPW_ERROR("Scan completed of wrong size %d "

				  "(should be %d)\n",

				  "(should be %zd)\n",

				  notif->size, sizeof(*x));

		}
@@ -3515,7 +3515,7 @@ static inline void ipw_rx_notification(struct ipw_priv* priv, 
			IPW_ERROR("Frag length: %d\n", x->frag_length);

		} else {

			IPW_ERROR("Frag length of wrong size %d "

				  "(should be %d)\n",

				  "(should be %zd)\n",

				  notif->size, sizeof(*x));

		}

		break;
@@ -3532,7 +3532,7 @@ static inline void ipw_rx_notification(struct ipw_priv* priv, 
			memcpy(&priv->last_link_deterioration, x, sizeof(*x));

		} else {

			IPW_ERROR("Link Deterioration of wrong size %d "

				  "(should be %d)\n",

				  "(should be %zd)\n",

				  notif->size, sizeof(*x));

		}

		break;
@@ -3552,7 +3552,7 @@ static inline void ipw_rx_notification(struct ipw_priv* priv, 
		struct notif_beacon_state *x = &notif->u.beacon_state;

		if (notif->size != sizeof(*x)) {

			IPW_ERROR("Beacon state of wrong size %d (should "

				  "be %d)\n", notif->size, sizeof(*x));

				  "be %zd)\n", notif->size, sizeof(*x));

			break;

		}
@@ -3602,7 +3602,7 @@ static inline void ipw_rx_notification(struct ipw_priv* priv, 
			break;

		} 



		IPW_ERROR("TGi Tx Key of wrong size %d (should be %d)\n",

		IPW_ERROR("TGi Tx Key of wrong size %d (should be %zd)\n",

			  notif->size, sizeof(*x));

		break;

	}
@@ -3616,7 +3616,7 @@ static inline void ipw_rx_notification(struct ipw_priv* priv, 
			break;

		} 

		

		IPW_ERROR("Calibration of wrong size %d (should be %d)\n",

		IPW_ERROR("Calibration of wrong size %d (should be %zd)\n",

			  notif->size, sizeof(*x));

		break;

	}
@@ -3628,7 +3628,7 @@ static inline void ipw_rx_notification(struct ipw_priv* priv, 
			break;

		}



		IPW_ERROR("Noise stat is wrong size %d (should be %d)\n",

		IPW_ERROR("Noise stat is wrong size %d (should be %zd)\n",

			  notif->size, sizeof(u32));

		break;

	}
@@ -4823,7 +4823,7 @@ static inline void ipw_handle_data_packet(struct ipw_priv *priv, 
	}



	/* Advance skb->data to the start of the actual payload */

	skb_reserve(rxb->skb, (u32)&pkt->u.frame.data[0] - (u32)pkt);

	skb_reserve(rxb->skb, offsetof(struct ipw_rx_packet, u.frame.data));



	/* Set the size of the skb to the size of the frame */

	skb_put(rxb->skb, pkt->u.frame.length);