lkml.org 
[lkml]   [2020]   [Feb]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RESEND PATCH v2 9/9] ath5k: Constify ioreadX() iomem argument (as in generic implementation)
    Date
    The ioreadX() helpers have inconsistent interface.  On some architectures
    void *__iomem address argument is a pointer to const, on some not.

    Implementations of ioreadX() do not modify the memory under the address
    so they can be converted to a "const" version for const-safety and
    consistency among architectures.

    Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
    Acked-by: Kalle Valo <kvalo@codeaurora.org>
    ---
    drivers/net/wireless/ath/ath5k/ahb.c | 10 +++++-----
    1 file changed, 5 insertions(+), 5 deletions(-)

    diff --git a/drivers/net/wireless/ath/ath5k/ahb.c b/drivers/net/wireless/ath/ath5k/ahb.c
    index 2c9cec8b53d9..8bd01df369fb 100644
    --- a/drivers/net/wireless/ath/ath5k/ahb.c
    +++ b/drivers/net/wireless/ath/ath5k/ahb.c
    @@ -138,18 +138,18 @@ static int ath_ahb_probe(struct platform_device *pdev)

    if (bcfg->devid >= AR5K_SREV_AR2315_R6) {
    /* Enable WMAC AHB arbitration */
    - reg = ioread32((void __iomem *) AR5K_AR2315_AHB_ARB_CTL);
    + reg = ioread32((const void __iomem *) AR5K_AR2315_AHB_ARB_CTL);
    reg |= AR5K_AR2315_AHB_ARB_CTL_WLAN;
    iowrite32(reg, (void __iomem *) AR5K_AR2315_AHB_ARB_CTL);

    /* Enable global WMAC swapping */
    - reg = ioread32((void __iomem *) AR5K_AR2315_BYTESWAP);
    + reg = ioread32((const void __iomem *) AR5K_AR2315_BYTESWAP);
    reg |= AR5K_AR2315_BYTESWAP_WMAC;
    iowrite32(reg, (void __iomem *) AR5K_AR2315_BYTESWAP);
    } else {
    /* Enable WMAC DMA access (assuming 5312 or 231x*/
    /* TODO: check other platforms */
    - reg = ioread32((void __iomem *) AR5K_AR5312_ENABLE);
    + reg = ioread32((const void __iomem *) AR5K_AR5312_ENABLE);
    if (to_platform_device(ah->dev)->id == 0)
    reg |= AR5K_AR5312_ENABLE_WLAN0;
    else
    @@ -202,12 +202,12 @@ static int ath_ahb_remove(struct platform_device *pdev)

    if (bcfg->devid >= AR5K_SREV_AR2315_R6) {
    /* Disable WMAC AHB arbitration */
    - reg = ioread32((void __iomem *) AR5K_AR2315_AHB_ARB_CTL);
    + reg = ioread32((const void __iomem *) AR5K_AR2315_AHB_ARB_CTL);
    reg &= ~AR5K_AR2315_AHB_ARB_CTL_WLAN;
    iowrite32(reg, (void __iomem *) AR5K_AR2315_AHB_ARB_CTL);
    } else {
    /*Stop DMA access */
    - reg = ioread32((void __iomem *) AR5K_AR5312_ENABLE);
    + reg = ioread32((const void __iomem *) AR5K_AR5312_ENABLE);
    if (to_platform_device(ah->dev)->id == 0)
    reg &= ~AR5K_AR5312_ENABLE_WLAN0;
    else
    --
    2.17.1
    \
     
     \ /
      Last update: 2020-02-19 18:53    [W:6.181 / U:0.576 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site