From patchwork Fri Oct 11 17:44:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 20983 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f198.google.com (mail-ob0-f198.google.com [209.85.214.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 57D0B25EA1 for ; Fri, 11 Oct 2013 17:45:17 +0000 (UTC) Received: by mail-ob0-f198.google.com with SMTP id va2sf17993443obc.9 for ; Fri, 11 Oct 2013 10:45:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=mime-version:x-gm-message-state:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=7r+DluffMWiGJ4JdN+2y09DlfcTOEaO09dT4FtwhSiE=; b=l9mcsZd7Ec/c7LCrqBbuWyI/v+WoALigoLA9qvmABvFZqh0supm43MoOeVgCAAcAFn 6Plow+mmMN5HwEWfDF4BXpKfG4u18lUYptpWUo8rr9asfWfmjN1UwK6Qc3j2zQuOAJ1e AgynxVjd8r5GC1PNaHGZDlgPUc6qyVJO9BxJvj6XhrU5CebfCZ2qBKKfyhoEBsp5Rm93 n0P14kAlEX7AFf3JLTLe50C5I0dEAUFErCwyJtvj3hybj0BM2uaqSP/i/cGp/5WulBFU 2oUeb1Z2ZZ6EM21J91e8ACDRK8mkbkFiak60+2J/oquUpbpna/VaJVQ455x3+9042IU5 K+Ew== X-Received: by 10.42.136.136 with SMTP id u8mr8543115ict.16.1381513516708; Fri, 11 Oct 2013 10:45:16 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.74.69 with SMTP id r5ls1498771qev.1.gmail; Fri, 11 Oct 2013 10:45:16 -0700 (PDT) X-Received: by 10.221.27.73 with SMTP id rp9mr2282096vcb.29.1381513516590; Fri, 11 Oct 2013 10:45:16 -0700 (PDT) Received: from mail-vc0-f179.google.com (mail-vc0-f179.google.com [209.85.220.179]) by mx.google.com with ESMTPS id un5si17081114vcb.22.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 11 Oct 2013 10:45:16 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.179 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.179; Received: by mail-vc0-f179.google.com with SMTP id ht10so3118845vcb.10 for ; Fri, 11 Oct 2013 10:45:16 -0700 (PDT) X-Gm-Message-State: ALoCoQloR5Zu44TlJiiqxu4F0HlOvH+8rcvU7AL2eI4XFuZeO40HpuGNZgIvMNCOcn0ZzvbxstMX X-Received: by 10.221.53.74 with SMTP id vp10mr28116vcb.54.1381513516474; Fri, 11 Oct 2013 10:45:16 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp58218vcz; Fri, 11 Oct 2013 10:45:16 -0700 (PDT) X-Received: by 10.194.193.4 with SMTP id hk4mr3940875wjc.29.1381513515536; Fri, 11 Oct 2013 10:45:15 -0700 (PDT) Received: from mail-wg0-f49.google.com (mail-wg0-f49.google.com [74.125.82.49]) by mx.google.com with ESMTPS id 19si21157030wjz.155.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 11 Oct 2013 10:45:15 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.82.49 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) client-ip=74.125.82.49; Received: by mail-wg0-f49.google.com with SMTP id x12so2224632wgg.16 for ; Fri, 11 Oct 2013 10:45:14 -0700 (PDT) X-Received: by 10.194.219.1 with SMTP id pk1mr17967872wjc.36.1381513514748; Fri, 11 Oct 2013 10:45:14 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id q17sm7700059wiv.10.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 11 Oct 2013 10:45:13 -0700 (PDT) From: Linus Walleij To: linux-gpio@vger.kernel.org Cc: Alexandre Courbot , Linus Walleij , Magnus Damm , Laurent Pinchart Subject: [PATCH] gpio: rcar: drop references to "virtual" IRQ Date: Fri, 11 Oct 2013 19:44:49 +0200 Message-Id: <1381513489-8044-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.8.3.1 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linus.walleij@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.179 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Rename the argument "virq" to just "irq", this IRQ isn't any more "virtual" than any other Linux IRQ number, we use "hwirq" for the actual hw-numbers, "virq" is just bogus. Cc: Magnus Damm Cc: Laurent Pinchart Signed-off-by: Linus Walleij --- drivers/gpio/gpio-rcar.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c index e3745eb..65dbf87 100644 --- a/drivers/gpio/gpio-rcar.c +++ b/drivers/gpio/gpio-rcar.c @@ -266,16 +266,16 @@ static int gpio_rcar_to_irq(struct gpio_chip *chip, unsigned offset) return irq_create_mapping(gpio_to_priv(chip)->irq_domain, offset); } -static int gpio_rcar_irq_domain_map(struct irq_domain *h, unsigned int virq, - irq_hw_number_t hw) +static int gpio_rcar_irq_domain_map(struct irq_domain *h, unsigned int irq, + irq_hw_number_t hwirq) { struct gpio_rcar_priv *p = h->host_data; - dev_dbg(&p->pdev->dev, "map hw irq = %d, virq = %d\n", (int)hw, virq); + dev_dbg(&p->pdev->dev, "map hw irq = %d, irq = %d\n", (int)hwirq, irq); - irq_set_chip_data(virq, h->host_data); - irq_set_chip_and_handler(virq, &p->irq_chip, handle_level_irq); - set_irq_flags(virq, IRQF_VALID); /* kill me now */ + irq_set_chip_data(irq, h->host_data); + irq_set_chip_and_handler(irq, &p->irq_chip, handle_level_irq); + set_irq_flags(irq, IRQF_VALID); /* kill me now */ return 0; }