AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

b43: Remove some dead code

Browse Source 
This patch removes some dead code from the driver.

Signed-off-by: Michael Buesch <mb@bu3sch.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Michael Buesch 2008-04-20 16:23:26 +02:00 committed by John W. Linville
parent f5eda47f45
commit f4440e8a47
2 changed files with 2 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/wireless/b43/lo.c
View File

@ -58,7 +58,6 @@ static void b43_lo_write(struct b43_wldev *dev, struct b43_loctl *control)
{ {
struct b43_phy *phy = &dev->phy; struct b43_phy *phy = &dev->phy;
u16 value; u16 value;
u16 reg;
if (B43_DEBUG) { if (B43_DEBUG) {
if (unlikely(abs(control->i) > 16 || abs(control->q) > 16)) { if (unlikely(abs(control->i) > 16 || abs(control->q) > 16)) {
@ -68,12 +67,11 @@ static void b43_lo_write(struct b43_wldev *dev, struct b43_loctl *control)
return; return;
} }
} }
B43_WARN_ON(phy->type != B43_PHYTYPE_G);
value = (u8) (control->q); value = (u8) (control->q);
value |= ((u8) (control->i)) << 8; value |= ((u8) (control->i)) << 8;
b43_phy_write(dev, B43_PHY_LO_CTL, value);
reg = (phy->type == B43_PHYTYPE_B) ? 0x002F : B43_PHY_LO_CTL;
b43_phy_write(dev, reg, value);
} }
static u16 lo_measure_feedthrough(struct b43_wldev *dev, static u16 lo_measure_feedthrough(struct b43_wldev *dev,

121
drivers/net/wireless/b43/phy.c
View File

@ -890,109 +890,6 @@ static void b43_phy_inita(struct b43_wldev *dev)
} }
} }
static void b43_phy_initb2(struct b43_wldev *dev)
{
struct b43_phy *phy = &dev->phy;
u16 offset, val;
b43_write16(dev, 0x03EC, 0x3F22);
b43_phy_write(dev, 0x0020, 0x301C);
b43_phy_write(dev, 0x0026, 0x0000);
b43_phy_write(dev, 0x0030, 0x00C6);
b43_phy_write(dev, 0x0088, 0x3E00);
val = 0x3C3D;
for (offset = 0x0089; offset < 0x00A7; offset++) {
b43_phy_write(dev, offset, val);
val -= 0x0202;
}
b43_phy_write(dev, 0x03E4, 0x3000);
b43_radio_selectchannel(dev, phy->channel, 0);
if (phy->radio_ver != 0x2050) {
b43_radio_write16(dev, 0x0075, 0x0080);
b43_radio_write16(dev, 0x0079, 0x0081);
}
b43_radio_write16(dev, 0x0050, 0x0020);
b43_radio_write16(dev, 0x0050, 0x0023);
if (phy->radio_ver == 0x2050) {
b43_radio_write16(dev, 0x0050, 0x0020);
b43_radio_write16(dev, 0x005A, 0x0070);
b43_radio_write16(dev, 0x005B, 0x007B);
b43_radio_write16(dev, 0x005C, 0x00B0);
b43_radio_write16(dev, 0x007A, 0x000F);
b43_phy_write(dev, 0x0038, 0x0677);
b43_radio_init2050(dev);
}
b43_phy_write(dev, 0x0014, 0x0080);
b43_phy_write(dev, 0x0032, 0x00CA);
b43_phy_write(dev, 0x0032, 0x00CC);
b43_phy_write(dev, 0x0035, 0x07C2);
//XXX won't trigger b43_lo_b_measure(dev);
b43_phy_write(dev, 0x0026, 0xCC00);
if (phy->radio_ver != 0x2050)
b43_phy_write(dev, 0x0026, 0xCE00);
b43_write16(dev, B43_MMIO_CHANNEL_EXT, 0x1000);
b43_phy_write(dev, 0x002A, 0x88A3);
if (phy->radio_ver != 0x2050)
b43_phy_write(dev, 0x002A, 0x88C2);
b43_set_txpower_g(dev, &phy->bbatt, &phy->rfatt, phy->tx_control);
b43_phy_init_pctl(dev);
}
static void b43_phy_initb4(struct b43_wldev *dev)
{
struct b43_phy *phy = &dev->phy;
u16 offset, val;
b43_write16(dev, 0x03EC, 0x3F22);
b43_phy_write(dev, 0x0020, 0x301C);
b43_phy_write(dev, 0x0026, 0x0000);
b43_phy_write(dev, 0x0030, 0x00C6);
b43_phy_write(dev, 0x0088, 0x3E00);
val = 0x3C3D;
for (offset = 0x0089; offset < 0x00A7; offset++) {
b43_phy_write(dev, offset, val);
val -= 0x0202;
}
b43_phy_write(dev, 0x03E4, 0x3000);
b43_radio_selectchannel(dev, phy->channel, 0);
if (phy->radio_ver != 0x2050) {
b43_radio_write16(dev, 0x0075, 0x0080);
b43_radio_write16(dev, 0x0079, 0x0081);
}
b43_radio_write16(dev, 0x0050, 0x0020);
b43_radio_write16(dev, 0x0050, 0x0023);
if (phy->radio_ver == 0x2050) {
b43_radio_write16(dev, 0x0050, 0x0020);
b43_radio_write16(dev, 0x005A, 0x0070);
b43_radio_write16(dev, 0x005B, 0x007B);
b43_radio_write16(dev, 0x005C, 0x00B0);
b43_radio_write16(dev, 0x007A, 0x000F);
b43_phy_write(dev, 0x0038, 0x0677);
b43_radio_init2050(dev);
}
b43_phy_write(dev, 0x0014, 0x0080);
b43_phy_write(dev, 0x0032, 0x00CA);
if (phy->radio_ver == 0x2050)
b43_phy_write(dev, 0x0032, 0x00E0);
b43_phy_write(dev, 0x0035, 0x07C2);
//XXX won't trigger b43_lo_b_measure(dev);
b43_phy_write(dev, 0x0026, 0xCC00);
if (phy->radio_ver == 0x2050)
b43_phy_write(dev, 0x0026, 0xCE00);
b43_write16(dev, B43_MMIO_CHANNEL_EXT, 0x1100);
b43_phy_write(dev, 0x002A, 0x88A3);
if (phy->radio_ver == 0x2050)
b43_phy_write(dev, 0x002A, 0x88C2);
b43_set_txpower_g(dev, &phy->bbatt, &phy->rfatt, phy->tx_control);
if (dev->dev->bus->sprom.boardflags_lo & B43_BFL_RSSI) {
b43_calc_nrssi_slope(dev);
b43_calc_nrssi_threshold(dev);
}
b43_phy_init_pctl(dev);
}
static void b43_phy_initb5(struct b43_wldev *dev) static void b43_phy_initb5(struct b43_wldev *dev)
{ {
struct ssb_bus *bus = dev->dev->bus; struct ssb_bus *bus = dev->dev->bus;
@ -1950,24 +1847,6 @@ int b43_phy_init(struct b43_wldev *dev)
else else
unsupported = 1; unsupported = 1;
break; break;
case B43_PHYTYPE_B:
switch (phy->rev) {
case 2:
b43_phy_initb2(dev);
break;
case 4:
b43_phy_initb4(dev);
break;
case 5:
b43_phy_initb5(dev);
break;
case 6:
b43_phy_initb6(dev);
break;
default:
unsupported = 1;
}
break;
case B43_PHYTYPE_G: case B43_PHYTYPE_G:
b43_phy_initg(dev); b43_phy_initg(dev);
break; break;