From e84ff3a22cfbcbe59ca1f113f4f129068aea604f Mon Sep 17 00:00:00 2001 From: Sergio Paracuellos Date: Fri, 25 May 2018 18:54:47 +0200 Subject: staging: mt7621-gpio: rename MTK_MAX_BANK into MTK_BANK_CNT There are 3 banks of gpios numbered '0' and '1' and '2'. So the maximum bank number is "2". "3" is the count of banks. In order to make the code looks and be correct on checking max allowed gpio's id it makes sense to change the name of this definition. Also there is another definitions which start with the same prefix MKK_BANK_ of the new name so having those with the same prefix makes all preprocessor structure to be the same. This improves readability. Signed-off-by: Sergio Paracuellos Reviewed-by: NeilBrown Signed-off-by: Greg Kroah-Hartman --- drivers/staging/mt7621-gpio/gpio-mt7621.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'drivers/staging') diff --git a/drivers/staging/mt7621-gpio/gpio-mt7621.c b/drivers/staging/mt7621-gpio/gpio-mt7621.c index 5d923a745684..64169367861c 100644 --- a/drivers/staging/mt7621-gpio/gpio-mt7621.c +++ b/drivers/staging/mt7621-gpio/gpio-mt7621.c @@ -14,7 +14,7 @@ #include #include -#define MTK_MAX_BANK 3 +#define MTK_BANK_CNT 3 #define MTK_BANK_WIDTH 32 enum mediatek_gpio_reg { @@ -43,7 +43,7 @@ struct mtk_data { void __iomem *gpio_membase; int gpio_irq; struct irq_domain *gpio_irq_domain; - struct mtk_gc *gc_map[MTK_MAX_BANK]; + struct mtk_gc *gc_map[MTK_BANK_CNT]; }; static inline struct mtk_gc @@ -156,7 +156,7 @@ mediatek_gpio_bank_probe(struct platform_device *pdev, struct device_node *bank) struct mtk_gc *rg; int ret; - if (!id || be32_to_cpu(*id) >= MTK_MAX_BANK) + if (!id || be32_to_cpu(*id) >= MTK_BANK_CNT) return -EINVAL; rg = devm_kzalloc(&pdev->dev, sizeof(struct mtk_gc), GFP_KERNEL); @@ -202,7 +202,7 @@ mediatek_gpio_irq_handler(struct irq_desc *desc) struct mtk_data *gpio_data = irq_desc_get_handler_data(desc); int i; - for (i = 0; i < MTK_MAX_BANK; i++) { + for (i = 0; i < MTK_BANK_CNT; i++) { struct mtk_gc *rg = gpio_data->gc_map[i]; unsigned long pending; int bit; @@ -345,7 +345,7 @@ mediatek_gpio_probe(struct platform_device *pdev) gpio_data->gpio_irq = irq_of_parse_and_map(np, 0); if (gpio_data->gpio_irq) { gpio_data->gpio_irq_domain = irq_domain_add_linear(np, - MTK_MAX_BANK * MTK_BANK_WIDTH, + MTK_BANK_CNT * MTK_BANK_WIDTH, &irq_domain_ops, gpio_data); if (!gpio_data->gpio_irq_domain) dev_err(&pdev->dev, "irq_domain_add_linear failed\n"); -- cgit v1.2.3-58-ga151