From patchwork Fri Oct 11 17:42:07 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 20982 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qe0-f72.google.com (mail-qe0-f72.google.com [209.85.128.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 7FD0725EA1 for ; Fri, 11 Oct 2013 17:42:14 +0000 (UTC) Received: by mail-qe0-f72.google.com with SMTP id b4sf5423117qen.11 for ; Fri, 11 Oct 2013 10:42:14 -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=njTZdaVj+yAn+dOn2AUhwiB7EyOhBHO4hSdJpYOAj+A=; b=QuCKkU0cOByzgkCzLCDo8IB66TVIiDBgv0/RgfFrmVWDfikYaLABRYGNW0tt+r8kMh 6WZttzuhzANimPAP/Qe2R9QNZ0mjoF09us/9bJXik0O08JyyBVZ1yS/Ku46l/U+tGAWR FezYDi01JrcBb4/xLspD0OPCQOZiCYr31dZa/cT/KQP2kHl6V1m47tWRKk+zjUhUeXhi HjcDGfBq81TMaxV0vl8YCcsZITHursJ31P/Qw2rEQwtgGkmhbMNhheysXOluZhcjClz1 U29KBfMt+YpFwNkYVlV0BpwLZzPi73mYMxVVB6aUt4dkHu0z7phacTdFP3b1mzJ0zKvB kkmQ== X-Received: by 10.236.135.79 with SMTP id t55mr19747915yhi.39.1381513334097; Fri, 11 Oct 2013 10:42:14 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.0.116 with SMTP id 20ls1443540qed.34.gmail; Fri, 11 Oct 2013 10:42:14 -0700 (PDT) X-Received: by 10.220.10.194 with SMTP id q2mr22019989vcq.2.1381513334005; Fri, 11 Oct 2013 10:42:14 -0700 (PDT) Received: from mail-vb0-f50.google.com (mail-vb0-f50.google.com [209.85.212.50]) by mx.google.com with ESMTPS id m3si13015222vdw.140.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 11 Oct 2013 10:42:14 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.50 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.50; Received: by mail-vb0-f50.google.com with SMTP id x14so3070759vbb.9 for ; Fri, 11 Oct 2013 10:42:13 -0700 (PDT) X-Gm-Message-State: ALoCoQng6t0I2pByNjlE/Y2SGBmqFF94CoTCo6zpNadJaQYIr53W3+p6REgvCS0murFeq+GPTiZr X-Received: by 10.52.161.231 with SMTP id xv7mr18649149vdb.1.1381513333921; Fri, 11 Oct 2013 10:42:13 -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 u4csp58033vcz; Fri, 11 Oct 2013 10:42:13 -0700 (PDT) X-Received: by 10.180.208.49 with SMTP id mb17mr4190993wic.64.1381513333032; Fri, 11 Oct 2013 10:42:13 -0700 (PDT) Received: from mail-wi0-f175.google.com (mail-wi0-f175.google.com [209.85.212.175]) by mx.google.com with ESMTPS id p2si1507820wix.1.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 11 Oct 2013 10:42:13 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.175 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) client-ip=209.85.212.175; Received: by mail-wi0-f175.google.com with SMTP id ez12so1486271wid.8 for ; Fri, 11 Oct 2013 10:42:12 -0700 (PDT) X-Received: by 10.194.63.228 with SMTP id j4mr18150200wjs.34.1381513332483; Fri, 11 Oct 2013 10:42:12 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id dl10sm8142615wib.1.2013.10.11.10.42.10 for (version=TLSv1.2 cipher=AES128-GCM-SHA256 bits=128/128); Fri, 11 Oct 2013 10:42:11 -0700 (PDT) From: Linus Walleij To: linux-gpio@vger.kernel.org Cc: Alexandre Courbot , Linus Walleij , Haojian Zhuang , Rob Herring , Baruch Siach Subject: [PATCH] gpio: pl061: drop references to "virtual" IRQ Date: Fri, 11 Oct 2013 19:42:07 +0200 Message-Id: <1381513327-7787-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.212.50 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: Haojian Zhuang Cc: Rob Herring Cc: Baruch Siach Signed-off-by: Linus Walleij --- drivers/gpio/gpio-pl061.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/gpio/gpio-pl061.c b/drivers/gpio/gpio-pl061.c index 4274e2e..f22f7f3 100644 --- a/drivers/gpio/gpio-pl061.c +++ b/drivers/gpio/gpio-pl061.c @@ -238,15 +238,15 @@ static struct irq_chip pl061_irqchip = { .irq_set_type = pl061_irq_type, }; -static int pl061_irq_map(struct irq_domain *d, unsigned int virq, - irq_hw_number_t hw) +static int pl061_irq_map(struct irq_domain *d, unsigned int irq, + irq_hw_number_t hwirq) { struct pl061_gpio *chip = d->host_data; - irq_set_chip_and_handler_name(virq, &pl061_irqchip, handle_simple_irq, + irq_set_chip_and_handler_name(irq, &pl061_irqchip, handle_simple_irq, "pl061"); - irq_set_chip_data(virq, chip); - irq_set_irq_type(virq, IRQ_TYPE_NONE); + irq_set_chip_data(irq, chip); + irq_set_irq_type(irq, IRQ_TYPE_NONE); return 0; }