From patchwork Fri Oct 11 17:23:27 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 20974 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f72.google.com (mail-pa0-f72.google.com [209.85.220.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id EEBF825EA1 for ; Fri, 11 Oct 2013 17:23:35 +0000 (UTC) Received: by mail-pa0-f72.google.com with SMTP id bj1sf8795072pad.7 for ; Fri, 11 Oct 2013 10:23:35 -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=ZXfxkf7+6chpr0rCxzYyZe6sPJONcAYXcF3iia+q/l0=; b=ezLwDEYOu6rWhPH23Rt7cPHvvECnPMhDpAywSI7Qo2wkIfxfxxLfiA2svurdcU8df6 NFmsi3ntMlmEalV7EuzIFg81F55lMz3yMt7phIAR0EGJ8dZ5zI6V0mDAqdQ0te3KEqLh MWKIzopboTBF+VD0m26Y8eHF6F45lj5h+hElsUazVkgNO7D9UwVR0s2b7fkIQCtAXgI5 UtloRblx1UdYGces5NvKj7DMAHjfoGAqL6lB7sQfsWnL9qoKpGlEYOpaumy7LjVBpQKy ka8N1qiMXDoGh0dmICrkT/ExFLUhYyZQNB8DUPeyeaHfPjrcwomyG0BQZogP/79YmRpe wy9w== X-Received: by 10.68.162.65 with SMTP id xy1mr7052387pbb.2.1381512215011; Fri, 11 Oct 2013 10:23:35 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.70.228 with SMTP id p4ls1554804qeu.43.gmail; Fri, 11 Oct 2013 10:23:34 -0700 (PDT) X-Received: by 10.220.142.140 with SMTP id q12mr18282906vcu.21.1381512214891; Fri, 11 Oct 2013 10:23:34 -0700 (PDT) Received: from mail-vc0-f172.google.com (mail-vc0-f172.google.com [209.85.220.172]) by mx.google.com with ESMTPS id j3si17049648vcf.39.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 11 Oct 2013 10:23:34 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.172 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.172; Received: by mail-vc0-f172.google.com with SMTP id hu8so3071738vcb.31 for ; Fri, 11 Oct 2013 10:23:34 -0700 (PDT) X-Gm-Message-State: ALoCoQkSBNjScbEfelDcNgmmjMTc8xuurxPOZaOLCqK8pTEZpMzOCWOIdLkPxyFFDOq+ZFBjTM7K X-Received: by 10.52.173.165 with SMTP id bl5mr18495094vdc.18.1381512214771; Fri, 11 Oct 2013 10:23:34 -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 u4csp56757vcz; Fri, 11 Oct 2013 10:23:34 -0700 (PDT) X-Received: by 10.180.182.68 with SMTP id ec4mr4145500wic.40.1381512213809; Fri, 11 Oct 2013 10:23:33 -0700 (PDT) Received: from mail-wi0-f170.google.com (mail-wi0-f170.google.com [209.85.212.170]) by mx.google.com with ESMTPS id df5si1466579wib.68.2013.10.11.10.23.33 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 11 Oct 2013 10:23:33 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.170 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) client-ip=209.85.212.170; Received: by mail-wi0-f170.google.com with SMTP id l12so1517425wiv.3 for ; Fri, 11 Oct 2013 10:23:33 -0700 (PDT) X-Received: by 10.194.200.100 with SMTP id jr4mr17677146wjc.37.1381512213265; Fri, 11 Oct 2013 10:23:33 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id j5sm7564471wia.4.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 11 Oct 2013 10:23:32 -0700 (PDT) From: Linus Walleij To: linux-gpio@vger.kernel.org Cc: Alexandre Courbot , Linus Walleij , Ian Molton , Magnus Damm Subject: [PATCH] gpio: em: drop references to "virtual" IRQ Date: Fri, 11 Oct 2013 19:23:27 +0200 Message-Id: <1381512207-6651-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.172 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: Ian Molton Cc: Magnus Damm Signed-off-by: Linus Walleij --- drivers/gpio/gpio-em.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/gpio/gpio-em.c b/drivers/gpio/gpio-em.c index 160d759..ec19036 100644 --- a/drivers/gpio/gpio-em.c +++ b/drivers/gpio/gpio-em.c @@ -232,16 +232,16 @@ static void em_gio_free(struct gpio_chip *chip, unsigned offset) em_gio_direction_input(chip, offset); } -static int em_gio_irq_domain_map(struct irq_domain *h, unsigned int virq, - irq_hw_number_t hw) +static int em_gio_irq_domain_map(struct irq_domain *h, unsigned int irq, + irq_hw_number_t hwirq) { struct em_gio_priv *p = h->host_data; - pr_debug("gio: map hw irq = %d, virq = %d\n", (int)hw, virq); + pr_debug("gio: 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; }