lkml.org 
[lkml]   [2021]   [Sep]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 24/32] staging: wfx: remove references to WFxxx in comments
    Date
    From: Jérôme Pouiller <jerome.pouiller@silabs.com>

    The WF200 is the only representative of the WFxxx series and the
    development of any successor is not expected. So, for clarity, replace
    occurrences of "WFxxx" with "WF200".

    Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
    ---
    drivers/staging/wfx/bh.c | 4 ++--
    drivers/staging/wfx/bus_spi.c | 6 +++---
    drivers/staging/wfx/data_tx.c | 4 ++--
    drivers/staging/wfx/fwio.c | 4 ++--
    drivers/staging/wfx/hif_api_cmd.h | 2 +-
    drivers/staging/wfx/hif_api_general.h | 2 +-
    drivers/staging/wfx/hif_api_mib.h | 2 +-
    drivers/staging/wfx/hif_rx.c | 3 +--
    drivers/staging/wfx/hif_rx.h | 3 +--
    drivers/staging/wfx/hif_tx.c | 12 +++++-------
    drivers/staging/wfx/hif_tx.h | 4 ++--
    drivers/staging/wfx/hif_tx_mib.c | 2 +-
    drivers/staging/wfx/hif_tx_mib.h | 2 +-
    drivers/staging/wfx/main.c | 2 +-
    drivers/staging/wfx/sta.c | 4 +---
    drivers/staging/wfx/sta.h | 2 +-
    drivers/staging/wfx/wfx.h | 2 +-
    17 files changed, 27 insertions(+), 33 deletions(-)

    diff --git a/drivers/staging/wfx/bh.c b/drivers/staging/wfx/bh.c
    index ed53d0b45592..78fa81d82517 100644
    --- a/drivers/staging/wfx/bh.c
    +++ b/drivers/staging/wfx/bh.c
    @@ -72,7 +72,7 @@ static int rx_helper(struct wfx_dev *wdev, size_t read_len, int *is_cnf)
    int piggyback = 0;

    WARN(read_len > round_down(0xFFF, 2) * sizeof(u16),
    - "%s: request exceed WFx capability", __func__);
    + "%s: request exceed the chip capability", __func__);

    // Add 2 to take into account piggyback size
    alloc_len = wdev->hwbus_ops->align_size(wdev->hwbus_priv, read_len + 2);
    @@ -181,7 +181,7 @@ static void tx_helper(struct wfx_dev *wdev, struct hif_msg *hif)

    data = hif;
    WARN(len > wdev->hw_caps.size_inp_ch_buf,
    - "%s: request exceed WFx capability: %zu > %d\n", __func__,
    + "%s: request exceed the chip capability: %zu > %d\n", __func__,
    len, wdev->hw_caps.size_inp_ch_buf);
    len = wdev->hwbus_ops->align_size(wdev->hwbus_priv, len);
    ret = wfx_data_write(wdev, data, len);
    diff --git a/drivers/staging/wfx/bus_spi.c b/drivers/staging/wfx/bus_spi.c
    index a99125d1a30d..759e085048c3 100644
    --- a/drivers/staging/wfx/bus_spi.c
    +++ b/drivers/staging/wfx/bus_spi.c
    @@ -39,9 +39,9 @@ struct wfx_spi_priv {
    };

    /*
    - * WFx chip read data 16bits at time and place them directly into (little
    - * endian) CPU register. So, chip expect byte order like "B1 B0 B3 B2" (while
    - * LE is "B0 B1 B2 B3" and BE is "B3 B2 B1 B0")
    + * The chip reads 16bits of data at time and place them directly into (little
    + * endian) CPU register. So, the chip expects bytes order to be "B1 B0 B3 B2"
    + * (while LE is "B0 B1 B2 B3" and BE is "B3 B2 B1 B0")
    *
    * A little endian host with bits_per_word == 16 should do the right job
    * natively. The code below to support big endian host and commonly used SPI
    diff --git a/drivers/staging/wfx/data_tx.c b/drivers/staging/wfx/data_tx.c
    index 77d69ed73e28..f141ab50f4fd 100644
    --- a/drivers/staging/wfx/data_tx.c
    +++ b/drivers/staging/wfx/data_tx.c
    @@ -31,8 +31,8 @@ static int wfx_get_hw_rate(struct wfx_dev *wdev,
    }
    return rate->idx + 14;
    }
    - // WFx only support 2GHz, else band information should be retrieved
    - // from ieee80211_tx_info
    + // The device only support 2GHz, else band information should be
    + // retrieved from ieee80211_tx_info
    band = wdev->hw->wiphy->bands[NL80211_BAND_2GHZ];
    if (rate->idx >= band->n_bitrates) {
    WARN(1, "wrong rate->idx value: %d", rate->idx);
    diff --git a/drivers/staging/wfx/fwio.c b/drivers/staging/wfx/fwio.c
    index 1b8aec02d169..7b91ac615f4a 100644
    --- a/drivers/staging/wfx/fwio.c
    +++ b/drivers/staging/wfx/fwio.c
    @@ -207,8 +207,8 @@ static int upload_firmware(struct wfx_dev *wdev, const u8 *data, size_t len)
    if (ret < 0)
    return ret;

    - // WFx seems to not support writing 0 in this register during
    - // first loop
    + // The device seems to not support writing 0 in this register
    + // during first loop
    offs += DNLD_BLOCK_SIZE;
    ret = sram_reg_write(wdev, WFX_DCA_PUT, offs);
    if (ret < 0)
    diff --git a/drivers/staging/wfx/hif_api_cmd.h b/drivers/staging/wfx/hif_api_cmd.h
    index 58c9bb036011..553dc45142f2 100644
    --- a/drivers/staging/wfx/hif_api_cmd.h
    +++ b/drivers/staging/wfx/hif_api_cmd.h
    @@ -1,6 +1,6 @@
    /* SPDX-License-Identifier: Apache-2.0 */
    /*
    - * WFx hardware interface definitions
    + * WF200 hardware interface definitions
    *
    * Copyright (c) 2018-2020, Silicon Laboratories Inc.
    */
    diff --git a/drivers/staging/wfx/hif_api_general.h b/drivers/staging/wfx/hif_api_general.h
    index 77030cecf134..714e1dd808e6 100644
    --- a/drivers/staging/wfx/hif_api_general.h
    +++ b/drivers/staging/wfx/hif_api_general.h
    @@ -1,6 +1,6 @@
    /* SPDX-License-Identifier: Apache-2.0 */
    /*
    - * WFx hardware interface definitions
    + * WF200 hardware interface definitions
    *
    * Copyright (c) 2018-2020, Silicon Laboratories Inc.
    */
    diff --git a/drivers/staging/wfx/hif_api_mib.h b/drivers/staging/wfx/hif_api_mib.h
    index 2a741a37a90c..b76f19224b5a 100644
    --- a/drivers/staging/wfx/hif_api_mib.h
    +++ b/drivers/staging/wfx/hif_api_mib.h
    @@ -1,6 +1,6 @@
    /* SPDX-License-Identifier: Apache-2.0 */
    /*
    - * WFx hardware interface definitions
    + * WF200 hardware interface definitions
    *
    * Copyright (c) 2018-2020, Silicon Laboratories Inc.
    */
    diff --git a/drivers/staging/wfx/hif_rx.c b/drivers/staging/wfx/hif_rx.c
    index a60c4a4ba935..fcfd5ccc9f01 100644
    --- a/drivers/staging/wfx/hif_rx.c
    +++ b/drivers/staging/wfx/hif_rx.c
    @@ -1,7 +1,6 @@
    // SPDX-License-Identifier: GPL-2.0-only
    /*
    - * Implementation of chip-to-host event (aka indications) of WFxxx Split Mac
    - * (WSM) API.
    + * Handling of the chip-to-host events (aka indications) of the hardware API.
    *
    * Copyright (c) 2017-2020, Silicon Laboratories, Inc.
    * Copyright (c) 2010, ST-Ericsson
    diff --git a/drivers/staging/wfx/hif_rx.h b/drivers/staging/wfx/hif_rx.h
    index f07c10c8c6bd..96543b81fa77 100644
    --- a/drivers/staging/wfx/hif_rx.h
    +++ b/drivers/staging/wfx/hif_rx.h
    @@ -1,7 +1,6 @@
    /* SPDX-License-Identifier: GPL-2.0-only */
    /*
    - * Implementation of chip-to-host event (aka indications) of WFxxx Split Mac
    - * (WSM) API.
    + * Handling of the chip-to-host events (aka indications) of the hardware API.
    *
    * Copyright (c) 2017-2019, Silicon Laboratories, Inc.
    * Copyright (c) 2010, ST-Ericsson
    diff --git a/drivers/staging/wfx/hif_tx.c b/drivers/staging/wfx/hif_tx.c
    index c5ab1c2e1e07..c1c97945317e 100644
    --- a/drivers/staging/wfx/hif_tx.c
    +++ b/drivers/staging/wfx/hif_tx.c
    @@ -1,7 +1,7 @@
    // SPDX-License-Identifier: GPL-2.0-only
    /*
    - * Implementation of host-to-chip commands (aka request/confirmation) of WFxxx
    - * Split Mac (WSM) API.
    + * Implementation of the host-to-chip commands (aka request/confirmation) of the
    + * hardware API.
    *
    * Copyright (c) 2017-2020, Silicon Laboratories, Inc.
    * Copyright (c) 2010, ST-Ericsson
    @@ -28,7 +28,7 @@ static void wfx_fill_header(struct hif_msg *hif, int if_id,
    if (if_id == -1)
    if_id = 2;

    - WARN(cmd > 0x3f, "invalid WSM command %#.2x", cmd);
    + WARN(cmd > 0x3f, "invalid hardware command %#.2x", cmd);
    WARN(size > 0xFFF, "requested buffer is too large: %zu bytes", size);
    WARN(if_id > 0x3, "invalid interface ID %d", if_id);

    @@ -108,12 +108,10 @@ int wfx_cmd_send(struct wfx_dev *wdev, struct hif_msg *request,
    mib_sep = "/";
    }
    if (ret < 0)
    - dev_err(wdev->dev,
    - "WSM request %s%s%s (%#.2x) on vif %d returned error %d\n",
    + dev_err(wdev->dev, "hardware request %s%s%s (%#.2x) on vif %d returned error %d\n",
    get_hif_name(cmd), mib_sep, mib_name, cmd, vif, ret);
    if (ret > 0)
    - dev_warn(wdev->dev,
    - "WSM request %s%s%s (%#.2x) on vif %d returned status %d\n",
    + dev_warn(wdev->dev, "hardware request %s%s%s (%#.2x) on vif %d returned status %d\n",
    get_hif_name(cmd), mib_sep, mib_name, cmd, vif, ret);

    return ret;
    diff --git a/drivers/staging/wfx/hif_tx.h b/drivers/staging/wfx/hif_tx.h
    index 46eed6cfa247..e57eabdcfa77 100644
    --- a/drivers/staging/wfx/hif_tx.h
    +++ b/drivers/staging/wfx/hif_tx.h
    @@ -1,7 +1,7 @@
    /* SPDX-License-Identifier: GPL-2.0-only */
    /*
    - * Implementation of host-to-chip commands (aka request/confirmation) of WFxxx
    - * Split Mac (WSM) API.
    + * Implementation of the host-to-chip commands (aka request/confirmation) of the
    + * hardware API.
    *
    * Copyright (c) 2017-2020, Silicon Laboratories, Inc.
    * Copyright (c) 2010, ST-Ericsson
    diff --git a/drivers/staging/wfx/hif_tx_mib.c b/drivers/staging/wfx/hif_tx_mib.c
    index 1900b7fafd9e..c745271944e9 100644
    --- a/drivers/staging/wfx/hif_tx_mib.c
    +++ b/drivers/staging/wfx/hif_tx_mib.c
    @@ -1,6 +1,6 @@
    // SPDX-License-Identifier: GPL-2.0-only
    /*
    - * Implementation of host-to-chip MIBs of WFxxx Split Mac (WSM) API.
    + * Implementation of the host-to-chip MIBs of the hardware API.
    *
    * Copyright (c) 2017-2020, Silicon Laboratories, Inc.
    * Copyright (c) 2010, ST-Ericsson
    diff --git a/drivers/staging/wfx/hif_tx_mib.h b/drivers/staging/wfx/hif_tx_mib.h
    index 812b3ba0f00e..2a3b84868ee4 100644
    --- a/drivers/staging/wfx/hif_tx_mib.h
    +++ b/drivers/staging/wfx/hif_tx_mib.h
    @@ -1,6 +1,6 @@
    /* SPDX-License-Identifier: GPL-2.0-only */
    /*
    - * Implementation of host-to-chip MIBs of WFxxx Split Mac (WSM) API.
    + * Implementation of the host-to-chip MIBs of the hardware API.
    *
    * Copyright (c) 2017-2020, Silicon Laboratories, Inc.
    * Copyright (c) 2010, ST-Ericsson
    diff --git a/drivers/staging/wfx/main.c b/drivers/staging/wfx/main.c
    index 2a759f3554c9..02b2e1c4ee12 100644
    --- a/drivers/staging/wfx/main.c
    +++ b/drivers/staging/wfx/main.c
    @@ -35,7 +35,7 @@

    #define WFX_PDS_MAX_SIZE 1500

    -MODULE_DESCRIPTION("Silicon Labs 802.11 Wireless LAN driver for WFx");
    +MODULE_DESCRIPTION("Silicon Labs 802.11 Wireless LAN driver for WF200");
    MODULE_AUTHOR("Jérôme Pouiller <jerome.pouiller@silabs.com>");
    MODULE_LICENSE("GPL");

    diff --git a/drivers/staging/wfx/sta.c b/drivers/staging/wfx/sta.c
    index 1e8d05c4f2da..1e21beeed438 100644
    --- a/drivers/staging/wfx/sta.c
    +++ b/drivers/staging/wfx/sta.c
    @@ -24,7 +24,7 @@ u32 wfx_rate_mask_to_hw(struct wfx_dev *wdev, u32 rates)
    {
    int i;
    u32 ret = 0;
    - // WFx only support 2GHz
    + // The device only supports 2GHz
    struct ieee80211_supported_band *sband = wdev->hw->wiphy->bands[NL80211_BAND_2GHZ];

    for (i = 0; i < sband->n_bitrates; i++) {
    @@ -242,8 +242,6 @@ int wfx_set_rts_threshold(struct ieee80211_hw *hw, u32 value)
    return 0;
    }

    -/* WSM callbacks */
    -
    void wfx_event_report_rssi(struct wfx_vif *wvif, u8 raw_rcpi_rssi)
    {
    /* RSSI: signed Q8.0, RCPI: unsigned Q7.1
    diff --git a/drivers/staging/wfx/sta.h b/drivers/staging/wfx/sta.h
    index d7b5df5ea4e6..056ed5267aba 100644
    --- a/drivers/staging/wfx/sta.h
    +++ b/drivers/staging/wfx/sta.h
    @@ -59,7 +59,7 @@ void wfx_unassign_vif_chanctx(struct ieee80211_hw *hw,
    struct ieee80211_vif *vif,
    struct ieee80211_chanctx_conf *conf);

    -// WSM Callbacks
    +// Hardware API Callbacks
    void wfx_cooling_timeout_work(struct work_struct *work);
    void wfx_suspend_hot_dev(struct wfx_dev *wdev, enum sta_notify_cmd cmd);
    void wfx_suspend_resume_mc(struct wfx_vif *wvif, enum sta_notify_cmd cmd);
    diff --git a/drivers/staging/wfx/wfx.h b/drivers/staging/wfx/wfx.h
    index 9749602f6cdc..5637f9af79c0 100644
    --- a/drivers/staging/wfx/wfx.h
    +++ b/drivers/staging/wfx/wfx.h
    @@ -1,6 +1,6 @@
    /* SPDX-License-Identifier: GPL-2.0-only */
    /*
    - * Common private data for Silicon Labs WFx chips.
    + * Common private data.
    *
    * Copyright (c) 2017-2020, Silicon Laboratories, Inc.
    * Copyright (c) 2010, ST-Ericsson
    --
    2.33.0
    \
     
     \ /
      Last update: 2021-09-13 15:04    [W:4.760 / U:0.268 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site