|
@@ -5120,25 +5120,11 @@ static void rt2800_init_rfcsr_5592(struct rt2x00_dev *rt2x00dev)
|
|
|
rt2800_led_open_drain_enable(rt2x00dev);
|
|
|
}
|
|
|
|
|
|
-static int rt2800_init_rfcsr(struct rt2x00_dev *rt2x00dev)
|
|
|
+static void rt2800_init_rfcsr(struct rt2x00_dev *rt2x00dev)
|
|
|
{
|
|
|
- if (!rt2x00_rt(rt2x00dev, RT3070) &&
|
|
|
- !rt2x00_rt(rt2x00dev, RT3071) &&
|
|
|
- !rt2x00_rt(rt2x00dev, RT3090) &&
|
|
|
- !rt2x00_rt(rt2x00dev, RT3290) &&
|
|
|
- !rt2x00_rt(rt2x00dev, RT3352) &&
|
|
|
- !rt2x00_rt(rt2x00dev, RT3390) &&
|
|
|
- !rt2x00_rt(rt2x00dev, RT3572) &&
|
|
|
- !rt2x00_rt(rt2x00dev, RT5390) &&
|
|
|
- !rt2x00_rt(rt2x00dev, RT5392) &&
|
|
|
- !rt2x00_rt(rt2x00dev, RT5392) &&
|
|
|
- !rt2x00_rt(rt2x00dev, RT5592) &&
|
|
|
- !rt2800_is_305x_soc(rt2x00dev))
|
|
|
- return 0;
|
|
|
-
|
|
|
if (rt2800_is_305x_soc(rt2x00dev)) {
|
|
|
rt2800_init_rfcsr_305x_soc(rt2x00dev);
|
|
|
- return 0;
|
|
|
+ return;
|
|
|
}
|
|
|
|
|
|
switch (rt2x00dev->chip.rt) {
|
|
@@ -5167,10 +5153,8 @@ static int rt2800_init_rfcsr(struct rt2x00_dev *rt2x00dev)
|
|
|
break;
|
|
|
case RT5592:
|
|
|
rt2800_init_rfcsr_5592(rt2x00dev);
|
|
|
- return 0;
|
|
|
+ break;
|
|
|
}
|
|
|
-
|
|
|
- return 0;
|
|
|
}
|
|
|
|
|
|
int rt2800_enable_radio(struct rt2x00_dev *rt2x00dev)
|
|
@@ -5196,10 +5180,11 @@ int rt2800_enable_radio(struct rt2x00_dev *rt2x00dev)
|
|
|
}
|
|
|
msleep(1);
|
|
|
|
|
|
- if (unlikely(rt2800_init_bbp(rt2x00dev) ||
|
|
|
- rt2800_init_rfcsr(rt2x00dev)))
|
|
|
+ if (unlikely(rt2800_init_bbp(rt2x00dev)))
|
|
|
return -EIO;
|
|
|
|
|
|
+ rt2800_init_rfcsr(rt2x00dev);
|
|
|
+
|
|
|
if (rt2x00_is_usb(rt2x00dev) &&
|
|
|
(rt2x00_rt(rt2x00dev, RT3070) ||
|
|
|
rt2x00_rt(rt2x00dev, RT3071) ||
|