]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
rt2x00: do not initialize BCN_OFFSET registers
authorStanislaw Gruszka <sgruszka@redhat.com>
Thu, 5 Jun 2014 11:52:27 +0000 (13:52 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 19 Jun 2014 19:49:15 +0000 (15:49 -0400)
We setup BCN_OFFSET{0,1} registers dynamically, don't have to
initialize them.

Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/rt2x00/rt2800lib.c

index a9cdddd2ab1a86be93859f6eb45239b86f4ba477..893c9d5f3d6f09c659710a855fd8425a5475d28a 100644 (file)
@@ -4562,28 +4562,6 @@ static int rt2800_init_registers(struct rt2x00_dev *rt2x00dev)
        if (ret)
                return ret;
 
-       rt2800_register_read(rt2x00dev, BCN_OFFSET0, &reg);
-       rt2x00_set_field32(&reg, BCN_OFFSET0_BCN0,
-                          rt2800_get_beacon_offset(rt2x00dev, 0));
-       rt2x00_set_field32(&reg, BCN_OFFSET0_BCN1,
-                          rt2800_get_beacon_offset(rt2x00dev, 1));
-       rt2x00_set_field32(&reg, BCN_OFFSET0_BCN2,
-                          rt2800_get_beacon_offset(rt2x00dev, 2));
-       rt2x00_set_field32(&reg, BCN_OFFSET0_BCN3,
-                          rt2800_get_beacon_offset(rt2x00dev, 3));
-       rt2800_register_write(rt2x00dev, BCN_OFFSET0, reg);
-
-       rt2800_register_read(rt2x00dev, BCN_OFFSET1, &reg);
-       rt2x00_set_field32(&reg, BCN_OFFSET1_BCN4,
-                          rt2800_get_beacon_offset(rt2x00dev, 4));
-       rt2x00_set_field32(&reg, BCN_OFFSET1_BCN5,
-                          rt2800_get_beacon_offset(rt2x00dev, 5));
-       rt2x00_set_field32(&reg, BCN_OFFSET1_BCN6,
-                          rt2800_get_beacon_offset(rt2x00dev, 6));
-       rt2x00_set_field32(&reg, BCN_OFFSET1_BCN7,
-                          rt2800_get_beacon_offset(rt2x00dev, 7));
-       rt2800_register_write(rt2x00dev, BCN_OFFSET1, reg);
-
        rt2800_register_write(rt2x00dev, LEGACY_BASIC_RATE, 0x0000013f);
        rt2800_register_write(rt2x00dev, HT_BASIC_RATE, 0x00008003);