From fadd6fdae7dbc46cc92008490f7a7c0bad72af7c Mon Sep 17 00:00:00 2001 From: Kamal Heib Date: Wed, 9 May 2018 15:40:09 +0300 Subject: [PATCH] staging: mt7621-eth: Prefer unsigned int to bare use of unsigned This commit replaces all the unsigned definitions in favour of 'unsigned int' which is preferred. Signed-off-by: Kamal Heib Signed-off-by: Greg Kroah-Hartman --- drivers/staging/mt7621-eth/gsw_mt7620.h | 4 ++-- drivers/staging/mt7621-eth/gsw_mt7621.c | 4 ++-- drivers/staging/mt7621-eth/mtk_eth_soc.c | 4 ++-- drivers/staging/mt7621-eth/mtk_eth_soc.h | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/staging/mt7621-eth/gsw_mt7620.h b/drivers/staging/mt7621-eth/gsw_mt7620.h index 1766939e2101..70f7e5481952 100644 --- a/drivers/staging/mt7621-eth/gsw_mt7620.h +++ b/drivers/staging/mt7621-eth/gsw_mt7620.h @@ -252,8 +252,8 @@ struct mt7620_gsw { }; /* switch register I/O wrappers */ -void mtk_switch_w32(struct mt7620_gsw *gsw, u32 val, unsigned reg); -u32 mtk_switch_r32(struct mt7620_gsw *gsw, unsigned reg); +void mtk_switch_w32(struct mt7620_gsw *gsw, u32 val, unsigned int reg); +u32 mtk_switch_r32(struct mt7620_gsw *gsw, unsigned int reg); /* the callback used by the driver core to bringup the switch */ int mtk_gsw_init(struct mtk_eth *eth); diff --git a/drivers/staging/mt7621-eth/gsw_mt7621.c b/drivers/staging/mt7621-eth/gsw_mt7621.c index 86138a36f525..2d2272e71edb 100644 --- a/drivers/staging/mt7621-eth/gsw_mt7621.c +++ b/drivers/staging/mt7621-eth/gsw_mt7621.c @@ -24,13 +24,13 @@ #include "mtk_eth_soc.h" #include "gsw_mt7620.h" -void mtk_switch_w32(struct mt7620_gsw *gsw, u32 val, unsigned reg) +void mtk_switch_w32(struct mt7620_gsw *gsw, u32 val, unsigned int reg) { iowrite32(val, gsw->base + reg); } EXPORT_SYMBOL_GPL(mtk_switch_w32); -u32 mtk_switch_r32(struct mt7620_gsw *gsw, unsigned reg) +u32 mtk_switch_r32(struct mt7620_gsw *gsw, unsigned int reg) { return ioread32(gsw->base + reg); } diff --git a/drivers/staging/mt7621-eth/mtk_eth_soc.c b/drivers/staging/mt7621-eth/mtk_eth_soc.c index 863d7a08359e..284585695869 100644 --- a/drivers/staging/mt7621-eth/mtk_eth_soc.c +++ b/drivers/staging/mt7621-eth/mtk_eth_soc.c @@ -82,12 +82,12 @@ static const u16 mtk_reg_table_default[MTK_REG_COUNT] = { static const u16 *mtk_reg_table = mtk_reg_table_default; -void mtk_w32(struct mtk_eth *eth, u32 val, unsigned reg) +void mtk_w32(struct mtk_eth *eth, u32 val, unsigned int reg) { __raw_writel(val, eth->base + reg); } -u32 mtk_r32(struct mtk_eth *eth, unsigned reg) +u32 mtk_r32(struct mtk_eth *eth, unsigned int reg) { return __raw_readl(eth->base + reg); } diff --git a/drivers/staging/mt7621-eth/mtk_eth_soc.h b/drivers/staging/mt7621-eth/mtk_eth_soc.h index 443f88d8af65..d3389b6e0366 100644 --- a/drivers/staging/mt7621-eth/mtk_eth_soc.h +++ b/drivers/staging/mt7621-eth/mtk_eth_soc.h @@ -706,8 +706,8 @@ void mtk_stats_update_mac(struct mtk_mac *mac); void mtk_reset(struct mtk_eth *eth, u32 reset_bits); /* register i/o wrappers */ -void mtk_w32(struct mtk_eth *eth, u32 val, unsigned reg); -u32 mtk_r32(struct mtk_eth *eth, unsigned reg); +void mtk_w32(struct mtk_eth *eth, u32 val, unsigned int reg); +u32 mtk_r32(struct mtk_eth *eth, unsigned int reg); /* default clock calibration handler */ int mtk_set_clock_cycle(struct mtk_eth *eth); -- 2.39.5