All of lore.kernel.org
 help / color / mirror / Atom feed
From: Carlo Perassi <carlo@linux.it>
To: kernel-janitors@vger.kernel.org
Subject: Re: [KJ] [PATCH] driver/net/tg3.c: some s/int/unsigned int
Date: Fri, 12 Nov 2004 15:13:45 +0000	[thread overview]
Message-ID: <20041112151345.GA4604@voyager> (raw)
In-Reply-To: <20041102101835.GA4083@voyager>

[-- Attachment #1: Type: text/plain, Size: 193 bytes --]

I read the old patch: limit in tg3_bmcr_reset and tg3_wait_macro_done
was not defined as unsigned.
Anyway I compiled and tested this new patch.

-- 
Carlo Perassi - http://www.linux.it/~carlo/

[-- Attachment #2: unsigned_drivers_net_tg3_d.patch --]
[-- Type: text/plain, Size: 6923 bytes --]

Signed-off-by: Carlo Perassi <carlo@linux.it>

---

--- linux-2.6.10-rc1-orig/drivers/net/tg3.c	2004-10-22 23:39:40.000000000 +0200
+++ linux-2.6.10-rc1-mod/drivers/net/tg3.c	2004-11-12 15:39:22.000000000 +0100
@@ -471,7 +471,8 @@ static void tg3_switch_clocks(struct tg3
 static int tg3_readphy(struct tg3 *tp, int reg, u32 *val)
 {
 	u32 frame_val;
-	int loops, ret;
+	int ret;
+	unsigned int loops;	
 
 	if ((tp->mi_mode & MAC_MI_MODE_AUTO_POLL) != 0) {
 		tw32_f(MAC_MI_MODE,
@@ -518,7 +519,8 @@ static int tg3_readphy(struct tg3 *tp, i
 static int tg3_writephy(struct tg3 *tp, int reg, u32 val)
 {
 	u32 frame_val;
-	int loops, ret;
+	int ret;
+	unsigned int loops;
 
 	if ((tp->mi_mode & MAC_MI_MODE_AUTO_POLL) != 0) {
 		tw32_f(MAC_MI_MODE,
@@ -595,7 +597,7 @@ static int tg3_bmcr_reset(struct tg3 *tp
 		}
 		udelay(10);
 	}
-	if (limit <= 0)
+	if (limit < 0)
 		return -EBUSY;
 
 	return 0;
@@ -612,7 +614,7 @@ static int tg3_wait_macro_done(struct tg
 		if ((tmp32 & 0x1000) == 0)
 			break;
 	}
-	if (limit <= 0)
+	if (limit < 0)
 		return -EBUSY;
 
 	return 0;
@@ -629,7 +631,7 @@ static int tg3_phy_write_and_check_testp
 	int chan;
 
 	for (chan = 0; chan < 4; chan++) {
-		int i;
+		unsigned int i;
 
 		tg3_writephy(tp, MII_TG3_DSP_ADDRESS,
 			     (chan * 0x2000) | 0x0200);
@@ -689,7 +691,7 @@ static int tg3_phy_reset_chanpat(struct 
 	int chan;
 
 	for (chan = 0; chan < 4; chan++) {
-		int i;
+		unsigned int i;
 
 		tg3_writephy(tp, MII_TG3_DSP_ADDRESS,
 			     (chan * 0x2000) | 0x0200);
@@ -1213,7 +1215,7 @@ static void tg3_aux_stat_to_speed_duplex
 static int tg3_phy_copper_begin(struct tg3 *tp)
 {
 	u32 new_adv;
-	int i;
+	unsigned int i;
 
 	if (tp->link_config.phy_is_low_power) {
 		/* Entering low power mode.  Disable gigabit and
@@ -1405,7 +1407,8 @@ static int tg3_setup_copper_phy(struct t
 	u32 bmsr, dummy;
 	u16 current_speed;
 	u8 current_duplex;
-	int i, err;
+	int err;
+	unsigned int i;
 
 	tw32(MAC_EVENT, 0);
 
@@ -2034,7 +2037,7 @@ static int fiber_autoneg(struct tg3 *tp,
 static void tg3_init_bcm8002(struct tg3 *tp)
 {
 	u32 mac_status = tr32(MAC_STATUS);
-	int i;
+	unsigned int i;
 
 	/* Reset when initting first time or we have a link. */
 	if ((tp->tg3_flags & TG3_FLAG_INIT_COMPLETE) &&
@@ -2257,7 +2260,7 @@ static int tg3_setup_fiber_phy(struct tg
 	u8 orig_active_duplex;
 	u32 mac_status;
 	int current_link_up;
-	int i;
+	unsigned int i;
 
 	orig_pause_cfg =
 		(tp->tg3_flags & (TG3_FLAG_RX_PAUSE |
@@ -2533,7 +2536,7 @@ static void tg3_recycle_rx(struct tg3 *t
 {
 	struct tg3_rx_buffer_desc *src_desc, *dest_desc;
 	struct ring_info *src_map, *dest_map;
-	int dest_idx;
+	unsigned int dest_idx;
 
 	switch (opaque_key) {
 	case RXD_OPAQUE_RING_STD:
@@ -2596,7 +2599,7 @@ static int tg3_vlan_rx(struct tg3 *tp, s
  * If both the host and chip were to write into the same ring, cache line
  * eviction could occur since both entities want it in an exclusive state.
  */
-static int tg3_rx(struct tg3 *tp, int budget)
+static unsigned int tg3_rx(struct tg3 *tp, int budget)
 {
 	u32 work_mask;
 	u32 rx_rcb_ptr = tp->rx_rcb_ptr;
@@ -2739,7 +2742,7 @@ static int tg3_poll(struct net_device *n
 	struct tg3 *tp = netdev_priv(netdev);
 	struct tg3_hw_status *sblk = tp->hw_status;
 	unsigned long flags;
-	int done;
+	unsigned int done;
 
 	spin_lock_irqsave(&tp->lock, flags);
 
@@ -3238,7 +3241,7 @@ static int tg3_change_mtu(struct net_dev
 static void tg3_free_rings(struct tg3 *tp)
 {
 	struct ring_info *rxp;
-	int i;
+	unsigned int i;
 
 	for (i = 0; i < TG3_RX_RING_SIZE; i++) {
 		rxp = &tp->rx_std_buffers[i];
@@ -3528,7 +3531,8 @@ static int tg3_stop_block(struct tg3 *tp
 /* tp->lock is held. */
 static int tg3_abort_hw(struct tg3 *tp)
 {
-	int i, err;
+	int err;
+	unsigned int i;
 
 	tg3_disable_ints(tp);
 
@@ -3597,7 +3601,7 @@ out:
 static int tg3_nvram_lock(struct tg3 *tp)
 {
 	if (tp->tg3_flags & TG3_FLAG_NVRAM) {
-		int i;
+		unsigned int i;
 
 		tw32(NVRAM_SWARB, SWARB_REQ_SET1);
 		for (i = 0; i < 8000; i++) {
@@ -3701,7 +3705,7 @@ static int tg3_chip_reset(struct tg3 *tp
 {
 	u32 val;
 	u32 flags_save;
-	int i;
+	unsigned int i;
 
 	if (!(tp->tg3_flags2 & TG3_FLG2_SUN_570X))
 		tg3_nvram_lock(tp);
@@ -3763,7 +3767,7 @@ static int tg3_chip_reset(struct tg3 *tp
 
 	if (tp->tg3_flags2 & TG3_FLG2_PCI_EXPRESS) {
 		if (tp->pci_chip_rev_id == CHIPREV_ID_5750_A0) {
-			int i;
+			unsigned int i;
 			u32 cfg_val;
 
 			/* Wait for link training to complete.  */
@@ -3871,7 +3875,7 @@ static void tg3_stop_fw(struct tg3 *tp)
 {
 	if (tp->tg3_flags & TG3_FLAG_ENABLE_ASF) {
 		u32 val;
-		int i;
+		unsigned int i;
 
 		tg3_write_mem(tp, NIC_SRAM_FW_CMD_MBOX, FWCMD_NICDRV_PAUSE_FW);
 		val = tr32(GRC_RX_CPU_EVENT);
@@ -4040,7 +4044,7 @@ u32 tg3FwData[(TG3_FW_DATA_LEN / sizeof(
 /* tp->lock is held. */
 static int tg3_halt_cpu(struct tg3 *tp, u32 offset)
 {
-	int i;
+	unsigned int i;
 
 	if (offset == TX_CPU_BASE &&
 	    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705)
@@ -4152,7 +4156,8 @@ out:
 static int tg3_load_5701_a0_firmware_fix(struct tg3 *tp)
 {
 	struct fw_info info;
-	int err, i;
+	int err;
+	unsigned int i;
 
 	info.text_base = TG3_FW_TEXT_ADDR;
 	info.text_len = TG3_FW_TEXT_LEN;
@@ -4711,7 +4716,8 @@ static int tg3_load_tso_firmware(struct 
 {
 	struct fw_info info;
 	unsigned long cpu_base, cpu_scratch_base, cpu_scratch_size;
-	int err, i;
+	int err;
+	unsigned int i;
 
 	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750)
 		return 0;
@@ -4784,7 +4790,7 @@ static int tg3_load_tso_firmware(struct 
 static void __tg3_set_mac_addr(struct tg3 *tp)
 {
 	u32 addr_high, addr_low;
-	int i;
+	unsigned int i;
 
 	addr_high = ((tp->dev->dev_addr[0] << 8) |
 		     tp->dev->dev_addr[1]);
@@ -6136,7 +6142,8 @@ static inline u32 calc_crc(unsigned char
 {
 	u32 reg;
 	u32 tmp;
-	int j, k;
+	int j;
+	unsigned int k;
 
 	reg = 0xffffffff;
 
@@ -6802,7 +6809,7 @@ static struct ethtool_ops tg3_ethtool_op
 /* Chips other than 5700/5701 use the NVRAM for fetching info. */
 static void __devinit tg3_nvram_init(struct tg3 *tp)
 {
-	int j;
+	unsigned int j;
 
 	if (tp->tg3_flags2 & TG3_FLG2_SUN_570X)
 		return;
@@ -6856,7 +6863,7 @@ static int tg3_nvram_read_using_eeprom(s
 					u32 offset, u32 *val)
 {
 	u32 tmp;
-	int i;
+	unsigned int i;
 
 	if (offset > EEPROM_ADDR_ADDR_MASK ||
 	    (offset % 4) != 0)
@@ -6889,7 +6896,7 @@ static int tg3_nvram_read_using_eeprom(s
 static int __devinit tg3_nvram_read(struct tg3 *tp,
 				    u32 offset, u32 *val)
 {
-	int i;
+	unsigned int i;
 
 	if (tp->tg3_flags2 & TG3_FLG2_SUN_570X) {
 		printk(KERN_ERR PFX "Attempt to do nvram_read on Sun 570X\n");
@@ -8106,7 +8113,8 @@ static int __devinit tg3_init_one(struct
 	unsigned long tg3reg_base, tg3reg_len;
 	struct net_device *dev;
 	struct tg3 *tp;
-	int i, err, pci_using_dac, pm_cap;
+	int err, pm_cap;
+	unsigned int i, pci_using_dac;
 
 	if (tg3_version_printed++ == 0)
 		printk(KERN_INFO "%s", version);

[-- Attachment #3: Type: text/plain, Size: 167 bytes --]

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors

  parent reply	other threads:[~2004-11-12 15:13 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2004-11-02 10:18 [KJ] [PATCH] driver/net/tg3.c: some s/int/unsigned int Carlo Perassi
2004-11-02 10:55 ` Carlo Perassi
2004-11-02 22:16 ` Felipe W Damasio
2004-11-03  7:43 ` Carlo Perassi
2004-11-03 10:37 ` Carlo Perassi
2004-11-03 23:59 ` David S. Miller
2004-11-04  9:35 ` Carlo Perassi
2004-11-08  8:07 ` Carlo Perassi
2004-11-11 22:54 ` David S. Miller
2004-11-12  0:14 ` Stefan Sperling
2004-11-12 10:27 ` Carlo Perassi
2004-11-12 11:29 ` Carlo Perassi
2004-11-12 15:13 ` Carlo Perassi [this message]
2004-11-18  0:23 ` David S. Miller
2004-11-18  9:35 ` Carlo Perassi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20041112151345.GA4604@voyager \
    --to=carlo@linux.it \
    --cc=kernel-janitors@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.