lkml.org 
[lkml]   [2009]   [Nov]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 19/41] rt2800usb: add rt2800_rf_[read,write]() wrappers
    From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
    Subject: [PATCH] rt2800usb: add rt2800_rf_[read,write]() wrappers

    Part of preparations for later code unification.

    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
    ---
    drivers/net/wireless/rt2x00/rt2800usb.c | 32 +++++++++++++++++++-------------
    1 file changed, 19 insertions(+), 13 deletions(-)

    Index: b/drivers/net/wireless/rt2x00/rt2800usb.c
    ===================================================================
    --- a/drivers/net/wireless/rt2x00/rt2800usb.c
    +++ b/drivers/net/wireless/rt2x00/rt2800usb.c
    @@ -226,6 +226,12 @@ static void rt2800usb_rf_write(struct rt
    mutex_unlock(&rt2x00dev->csr_mutex);
    }

    +static inline void rt2800_rf_write(struct rt2x00_dev *rt2x00dev,
    + const unsigned int word, const u32 value)
    +{
    + rt2800usb_rf_write(rt2x00dev, word, value);
    +}
    +
    static void rt2800usb_mcu_request(struct rt2x00_dev *rt2x00dev,
    const u8 command, const u8 token,
    const u8 arg0, const u8 arg1)
    @@ -280,7 +286,7 @@ static const struct rt2x00debug rt2800us
    },
    .rf = {
    .read = rt2x00_rf_read,
    - .write = rt2800usb_rf_write,
    + .write = rt2800_rf_write,
    .word_base = RF_BASE,
    .word_size = sizeof(u32),
    .word_count = RF_SIZE / sizeof(u32),
    @@ -757,24 +763,24 @@ static void rt2800usb_config_channel_rt2

    rt2x00_set_field32(&rf->rf4, RF4_HT40, conf_is_ht40(conf));

    - rt2800usb_rf_write(rt2x00dev, 1, rf->rf1);
    - rt2800usb_rf_write(rt2x00dev, 2, rf->rf2);
    - rt2800usb_rf_write(rt2x00dev, 3, rf->rf3 & ~0x00000004);
    - rt2800usb_rf_write(rt2x00dev, 4, rf->rf4);
    + rt2800_rf_write(rt2x00dev, 1, rf->rf1);
    + rt2800_rf_write(rt2x00dev, 2, rf->rf2);
    + rt2800_rf_write(rt2x00dev, 3, rf->rf3 & ~0x00000004);
    + rt2800_rf_write(rt2x00dev, 4, rf->rf4);

    udelay(200);

    - rt2800usb_rf_write(rt2x00dev, 1, rf->rf1);
    - rt2800usb_rf_write(rt2x00dev, 2, rf->rf2);
    - rt2800usb_rf_write(rt2x00dev, 3, rf->rf3 | 0x00000004);
    - rt2800usb_rf_write(rt2x00dev, 4, rf->rf4);
    + rt2800_rf_write(rt2x00dev, 1, rf->rf1);
    + rt2800_rf_write(rt2x00dev, 2, rf->rf2);
    + rt2800_rf_write(rt2x00dev, 3, rf->rf3 | 0x00000004);
    + rt2800_rf_write(rt2x00dev, 4, rf->rf4);

    udelay(200);

    - rt2800usb_rf_write(rt2x00dev, 1, rf->rf1);
    - rt2800usb_rf_write(rt2x00dev, 2, rf->rf2);
    - rt2800usb_rf_write(rt2x00dev, 3, rf->rf3 & ~0x00000004);
    - rt2800usb_rf_write(rt2x00dev, 4, rf->rf4);
    + rt2800_rf_write(rt2x00dev, 1, rf->rf1);
    + rt2800_rf_write(rt2x00dev, 2, rf->rf2);
    + rt2800_rf_write(rt2x00dev, 3, rf->rf3 & ~0x00000004);
    + rt2800_rf_write(rt2x00dev, 4, rf->rf4);
    }

    static void rt2800usb_config_channel_rt3x(struct rt2x00_dev *rt2x00dev,

    \
     
     \ /
      Last update: 2009-11-04 18:55    [W:0.029 / U:1.064 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site