Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 66525
b: refs/heads/master
c: ffe1437
h: refs/heads/master
i:
  66523: 061a05c
v: v3
  • Loading branch information
Ulrich Kunitz authored and David S. Miller committed Oct 10, 2007
1 parent d6f7a8d commit fc0e19e
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 19 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5dcddfae63bd26da0f11a8e40f0ae555b5ac624e
refs/heads/master: ffe143741f9e0fc3731fe6fe977a2273da4837bd
18 changes: 0 additions & 18 deletions trunk/drivers/net/wireless/zd1211rw/zd_chip.c
Original file line number Diff line number Diff line change
Expand Up @@ -500,8 +500,6 @@ int zd_chip_lock_phy_regs(struct zd_chip *chip)
return r;
}

dev_dbg_f(zd_chip_dev(chip),
"CR_REG1: 0x%02x -> 0x%02x\n", tmp, tmp & ~UNLOCK_PHY_REGS);
tmp &= ~UNLOCK_PHY_REGS;

r = zd_iowrite32_locked(chip, tmp, CR_REG1);
Expand All @@ -523,8 +521,6 @@ int zd_chip_unlock_phy_regs(struct zd_chip *chip)
return r;
}

dev_dbg_f(zd_chip_dev(chip),
"CR_REG1: 0x%02x -> 0x%02x\n", tmp, tmp | UNLOCK_PHY_REGS);
tmp |= UNLOCK_PHY_REGS;

r = zd_iowrite32_locked(chip, tmp, CR_REG1);
Expand Down Expand Up @@ -841,8 +837,6 @@ static int get_aw_pt_bi(struct zd_chip *chip, struct aw_pt_bi *s)
s->atim_wnd_period = values[0];
s->pre_tbtt = values[1];
s->beacon_interval = values[2];
dev_dbg_f(zd_chip_dev(chip), "aw %u pt %u bi %u\n",
s->atim_wnd_period, s->pre_tbtt, s->beacon_interval);
return 0;
}

Expand All @@ -864,9 +858,6 @@ static int set_aw_pt_bi(struct zd_chip *chip, struct aw_pt_bi *s)
reqs[2].addr = CR_BCN_INTERVAL;
reqs[2].value = s->beacon_interval;

dev_dbg_f(zd_chip_dev(chip),
"aw %u pt %u bi %u\n", s->atim_wnd_period, s->pre_tbtt,
s->beacon_interval);
return zd_iowrite32a_locked(chip, reqs, ARRAY_SIZE(reqs));
}

Expand Down Expand Up @@ -1160,16 +1151,12 @@ int zd_chip_init_hw(struct zd_chip *chip)
static int update_pwr_int(struct zd_chip *chip, u8 channel)
{
u8 value = chip->pwr_int_values[channel - 1];
dev_dbg_f(zd_chip_dev(chip), "channel %d pwr_int %#04x\n",
channel, value);
return zd_iowrite16_locked(chip, value, CR31);
}

static int update_pwr_cal(struct zd_chip *chip, u8 channel)
{
u8 value = chip->pwr_cal_values[channel-1];
dev_dbg_f(zd_chip_dev(chip), "channel %d pwr_cal %#04x\n",
channel, value);
return zd_iowrite16_locked(chip, value, CR68);
}

Expand All @@ -1184,9 +1171,6 @@ static int update_ofdm_cal(struct zd_chip *chip, u8 channel)
ioreqs[2].addr = CR65;
ioreqs[2].value = chip->ofdm_cal_values[OFDM_54M_INDEX][channel-1];

dev_dbg_f(zd_chip_dev(chip),
"channel %d ofdm_cal 36M %#04x 48M %#04x 54M %#04x\n",
channel, ioreqs[0].value, ioreqs[1].value, ioreqs[2].value);
return zd_iowrite16a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));
}

Expand Down Expand Up @@ -1638,7 +1622,5 @@ int zd_chip_set_multicast_hash(struct zd_chip *chip,
{ CR_GROUP_HASH_P2, hash->high },
};

dev_dbg_f(zd_chip_dev(chip), "hash l 0x%08x h 0x%08x\n",
ioreqs[0].value, ioreqs[1].value);
return zd_iowrite32a(chip, ioreqs, ARRAY_SIZE(ioreqs));
}

0 comments on commit fc0e19e

Please sign in to comment.