From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 2D33C1CF1CD for ; Wed, 16 May 2018 05:30:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 3E5FD86CB7 for ; Wed, 16 May 2018 05:30:15 +0000 (UTC) Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id R1qX45uSe2bF for ; Wed, 16 May 2018 05:30:14 +0000 (UTC) Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by hemlock.osuosl.org (Postfix) with ESMTPS id 35F1386A43 for ; Wed, 16 May 2018 05:30:14 +0000 (UTC) Received: by mail-wr0-f195.google.com with SMTP id a12-v6so2310647wrn.13 for ; Tue, 15 May 2018 22:30:14 -0700 (PDT) From: Sergio Paracuellos Subject: [PATCH v2 05/11] staging: mt7621-gpio: avoid use of globals and use platform_data instead Date: Wed, 16 May 2018 07:29:58 +0200 Message-Id: <1526448604-3533-6-git-send-email-sergio.paracuellos@gmail.com> In-Reply-To: <1526448604-3533-1-git-send-email-sergio.paracuellos@gmail.com> References: <1526448604-3533-1-git-send-email-sergio.paracuellos@gmail.com> List-Id: Linux Driver Project Developer List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: driverdev-devel-bounces@linuxdriverproject.org Sender: "devel" To: gregkh@linuxfoundation.org Cc: neil@brown.name, driverdev-devel@linuxdriverproject.org Gpio driver have a some globals which can be avoided just using platform_data in a proper form. This commit adds a new struct mtk_data which includes all of those globals setting them using platform_set_drvdata and devm_gpiochip_add_data functions. With this properly set we are able to retrieve driver data along the code using kernel api's so globals are not needed anymore. Signed-off-by: Sergio Paracuellos --- drivers/staging/mt7621-gpio/gpio-mt7621.c | 85 +++++++++++++++++++++---------- 1 file changed, 59 insertions(+), 26 deletions(-) diff --git a/drivers/staging/mt7621-gpio/gpio-mt7621.c b/drivers/staging/mt7621-gpio/gpio-mt7621.c index 7d17949..c701259 100644 --- a/drivers/staging/mt7621-gpio/gpio-mt7621.c +++ b/drivers/staging/mt7621-gpio/gpio-mt7621.c @@ -31,17 +31,20 @@ enum mediatek_gpio_reg { GPIO_REG_EDGE, }; -static void __iomem *mediatek_gpio_membase; -static int mediatek_gpio_irq; -static struct irq_domain *mediatek_gpio_irq_domain; - -static struct mtk_gc { +struct mtk_gc { struct gpio_chip chip; spinlock_t lock; int bank; u32 rising; u32 falling; -} *gc_map[MTK_MAX_BANK]; +}; + +struct mtk_data { + void __iomem *gpio_membase; + int gpio_irq; + struct irq_domain *gpio_irq_domain; + struct mtk_gc *gc_map[MTK_MAX_BANK]; +}; static inline struct mtk_gc *to_mediatek_gpio(struct gpio_chip *chip) @@ -56,15 +59,19 @@ static inline struct mtk_gc static inline void mtk_gpio_w32(struct mtk_gc *rg, u8 reg, u32 val) { - iowrite32(val, mediatek_gpio_membase + (reg * 0x10) + (rg->bank * 0x4)); + struct mtk_data *gpio_data = gpiochip_get_data(&rg->chip); + u32 offset = (reg * 0x10) + (rg->bank * 0x4); + + iowrite32(val, gpio_data->gpio_membase + offset); } static inline u32 mtk_gpio_r32(struct mtk_gc *rg, u8 reg) { + struct mtk_data *gpio_data = gpiochip_get_data(&rg->chip); u32 offset = (reg * 0x10) + (rg->bank * 0x4); - return ioread32(mediatek_gpio_membase + offset); + return ioread32(gpio_data->gpio_membase + offset); } static void @@ -137,23 +144,26 @@ mediatek_gpio_get_direction(struct gpio_chip *chip, unsigned int offset) static int mediatek_gpio_to_irq(struct gpio_chip *chip, unsigned int pin) { + struct mtk_data *gpio_data = gpiochip_get_data(chip); struct mtk_gc *rg = to_mediatek_gpio(chip); - return irq_create_mapping(mediatek_gpio_irq_domain, + return irq_create_mapping(gpio_data->gpio_irq_domain, pin + (rg->bank * MTK_BANK_WIDTH)); } static int mediatek_gpio_bank_probe(struct platform_device *pdev, struct device_node *bank) { + struct mtk_data *gpio_data = dev_get_drvdata(&pdev->dev); const __be32 *id = of_get_property(bank, "reg", NULL); struct mtk_gc *rg = devm_kzalloc(&pdev->dev, sizeof(struct mtk_gc), GFP_KERNEL); + int ret; if (!rg || !id || be32_to_cpu(*id) > MTK_MAX_BANK) return -ENOMEM; - gc_map[be32_to_cpu(*id)] = rg; + gpio_data->gc_map[be32_to_cpu(*id)] = rg; memset(rg, 0, sizeof(struct mtk_gc)); @@ -169,10 +179,17 @@ mediatek_gpio_bank_probe(struct platform_device *pdev, struct device_node *bank) rg->chip.get_direction = mediatek_gpio_get_direction; rg->chip.get = mediatek_gpio_get; rg->chip.set = mediatek_gpio_set; - if (mediatek_gpio_irq_domain) + if (gpio_data->gpio_irq_domain) rg->chip.to_irq = mediatek_gpio_to_irq; rg->bank = be32_to_cpu(*id); + ret = devm_gpiochip_add_data(&pdev->dev, &rg->chip, gpio_data); + if (ret < 0) { + dev_err(&pdev->dev, "Could not register gpio %d, ret=%d\n", + rg->chip.ngpio, ret); + return ret; + } + /* set polarity to low for all gpios */ mtk_gpio_w32(rg, GPIO_REG_POL, 0); @@ -184,10 +201,12 @@ mediatek_gpio_bank_probe(struct platform_device *pdev, struct device_node *bank) static void mediatek_gpio_irq_handler(struct irq_desc *desc) { + struct gpio_chip *gc = irq_desc_get_handler_data(desc); + struct mtk_data *gpio_data = gpiochip_get_data(gc); int i; for (i = 0; i < MTK_MAX_BANK; i++) { - struct mtk_gc *rg = gc_map[i]; + struct mtk_gc *rg = gpio_data->gc_map[i]; unsigned long pending; int bit; @@ -197,7 +216,7 @@ mediatek_gpio_irq_handler(struct irq_desc *desc) pending = mtk_gpio_r32(rg, GPIO_REG_STAT); for_each_set_bit(bit, &pending, MTK_BANK_WIDTH) { - u32 map = irq_find_mapping(mediatek_gpio_irq_domain, + u32 map = irq_find_mapping(gpio_data->gpio_irq_domain, (MTK_BANK_WIDTH * i) + bit); generic_handle_irq(map); @@ -209,9 +228,11 @@ mediatek_gpio_irq_handler(struct irq_desc *desc) static void mediatek_gpio_irq_unmask(struct irq_data *d) { + struct gpio_chip *gc = irq_data_get_irq_chip_data(d); + struct mtk_data *gpio_data = gpiochip_get_data(gc); int pin = d->hwirq; int bank = pin / 32; - struct mtk_gc *rg = gc_map[bank]; + struct mtk_gc *rg = gpio_data->gc_map[bank]; unsigned long flags; u32 rise, fall; @@ -230,9 +251,11 @@ mediatek_gpio_irq_unmask(struct irq_data *d) static void mediatek_gpio_irq_mask(struct irq_data *d) { + struct gpio_chip *gc = irq_data_get_irq_chip_data(d); + struct mtk_data *gpio_data = gpiochip_get_data(gc); int pin = d->hwirq; int bank = pin / 32; - struct mtk_gc *rg = gc_map[bank]; + struct mtk_gc *rg = gpio_data->gc_map[bank]; unsigned long flags; u32 rise, fall; @@ -251,9 +274,11 @@ mediatek_gpio_irq_mask(struct irq_data *d) static int mediatek_gpio_irq_type(struct irq_data *d, unsigned int type) { + struct gpio_chip *gc = irq_data_get_irq_chip_data(d); + struct mtk_data *gpio_data = gpiochip_get_data(gc); int pin = d->hwirq; int bank = pin / 32; - struct mtk_gc *rg = gc_map[bank]; + struct mtk_gc *rg = gpio_data->gc_map[bank]; u32 mask = BIT(d->hwirq); if (!rg) @@ -308,27 +333,35 @@ mediatek_gpio_probe(struct platform_device *pdev) { struct device_node *bank, *np = pdev->dev.of_node; struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + struct mtk_data *gpio_data; - mediatek_gpio_membase = devm_ioremap_resource(&pdev->dev, res); - if (IS_ERR(mediatek_gpio_membase)) - return PTR_ERR(mediatek_gpio_membase); + gpio_data = devm_kzalloc(&pdev->dev, sizeof(*gpio_data), GFP_KERNEL); + if (!gpio_data) + return -ENOMEM; - mediatek_gpio_irq = irq_of_parse_and_map(np, 0); - if (mediatek_gpio_irq) { - mediatek_gpio_irq_domain = irq_domain_add_linear(np, + gpio_data->gpio_membase = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(gpio_data->gpio_membase)) + return PTR_ERR(gpio_data->gpio_membase); + + 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, &irq_domain_ops, NULL); - if (!mediatek_gpio_irq_domain) + if (!gpio_data->gpio_irq_domain) dev_err(&pdev->dev, "irq_domain_add_linear failed\n"); } + platform_set_drvdata(pdev, gpio_data); + for_each_child_of_node(np, bank) if (of_device_is_compatible(bank, "mediatek,mt7621-gpio-bank")) mediatek_gpio_bank_probe(pdev, bank); - if (mediatek_gpio_irq_domain) - irq_set_chained_handler(mediatek_gpio_irq, - mediatek_gpio_irq_handler); + if (gpio_data->gpio_irq_domain) + irq_set_chained_handler_and_data(gpio_data->gpio_irq, + mediatek_gpio_irq_handler, + gpio_data); return 0; } -- 2.7.4 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel