diff mbox

[11/11] rt2800: cleanup rt2800_init_rfcsr

Message ID 1365519930-3230-12-git-send-email-stf_xl@wp.pl (mailing list archive)
State Not Applicable, archived
Headers show

Commit Message

Stanislaw Gruszka April 9, 2013, 3:05 p.m. UTC 
From: Stanislaw Gruszka <stf_xl@wp.pl>

This procedure is simple switch now and return no error any longer.

Signed-off-by: Stanislaw Gruszka <stf_xl@wp.pl>
---
 drivers/net/wireless/rt2x00/rt2800lib.c |   31 ++++++-------------------------
 1 files changed, 6 insertions(+), 25 deletions(-)

Comments

Gertjan van Wingerde April 14, 2013, 8:20 p.m. UTC | #1 
(Resending as the message didn't seem to end up on the mailing list)

> Hi Stanislaw,
> 
> Looks good to me. When you repost the series with all comments fixed, you can add my acked-by.
> 
> Sent from my iPad
> 
> On 9 apr. 2013, at 17:05, stf_xl@wp.pl wrote:
> 
>> From: Stanislaw Gruszka <stf_xl@wp.pl>
>> 
>> This procedure is simple switch now and return no error any longer.
>> 
>> Signed-off-by: Stanislaw Gruszka <stf_xl@wp.pl>
>> ---
>> drivers/net/wireless/rt2x00/rt2800lib.c |   31 ++++++-------------------------
>> 1 files changed, 6 insertions(+), 25 deletions(-)
>> 
>> diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
>> index f31b9b9..b084e90 100644
>> --- a/drivers/net/wireless/rt2x00/rt2800lib.c
>> +++ b/drivers/net/wireless/rt2x00/rt2800lib.c
>> @@ -5100,29 +5100,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)
>> {
>> -    struct rt2800_drv_data *drv_data = rt2x00dev->drv_data;
>> -    u8 rfcsr;
>> -    u32 reg;
>> -
>> -    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) {
>> @@ -5151,10 +5133,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)
>> @@ -5180,10 +5160,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) ||
>> -- 
>> 1.7.4.4
>> 
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
index f31b9b9..b084e90 100644
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -5100,29 +5100,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)
 {
-	struct rt2800_drv_data *drv_data = rt2x00dev->drv_data;
-	u8 rfcsr;
-	u32 reg;
-
-	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) {
@@ -5151,10 +5133,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)
@@ -5180,10 +5160,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) ||