From patchwork Fri Oct 5 15:31:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 12022 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id DD11C24156 for ; Fri, 5 Oct 2012 15:32:05 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id 8DB50A1889F for ; Fri, 5 Oct 2012 15:32:05 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so3999259iej.11 for ; Fri, 05 Oct 2012 08:32:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=6eVBZtZwtvJelUWYlek7JjBCbauqOQFtIKVydkgneH0=; b=Etx3xQDsfZ98YtLuMxCQ7AD4nO5Fd2gB+tLRiMf/41w1MSQXevCGaitqZeQmCyIdjH vyvOKDumPTRFJkTUKGg4EKjE4QzJ356W6kvjYBteXxjY2uVAci0cT46yCEQmNF/6/9pR /klcexvCQ1xJ7o12bjp0PEL2952l8JqyXKEH+YvpGdHrMgZsg2H8jk8PilQ6IT7lC1Cr xyp1icHIfuxR+x9eQYEyNd5CHjHQkpNqEhmaIlITLW9PGaXvfKJkE8ePD+e38VUCKiFr oKv7g5adfpkXFyecereDyWrHd0ZFU5usAheky7KFcybwuvtckNGoHJ7zwGbbh3Y3lJv2 WSlg== Received: by 10.50.194.136 with SMTP id hw8mr1516708igc.28.1349451125348; Fri, 05 Oct 2012 08:32:05 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.232 with SMTP id ex8csp132544igc; Fri, 5 Oct 2012 08:32:04 -0700 (PDT) Received: by 10.216.194.205 with SMTP id m55mr1144878wen.79.1349451123699; Fri, 05 Oct 2012 08:32:03 -0700 (PDT) Received: from mail-wg0-f50.google.com (mail-wg0-f50.google.com [74.125.82.50]) by mx.google.com with ESMTPS id ce4si3115897wib.13.2012.10.05.08.32.03 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 05 Oct 2012 08:32:03 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.82.50 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=74.125.82.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.50 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) smtp.mail=lee.jones@linaro.org Received: by mail-wg0-f50.google.com with SMTP id 16so1483219wgi.31 for ; Fri, 05 Oct 2012 08:32:03 -0700 (PDT) Received: by 10.180.86.34 with SMTP id m2mr4092960wiz.14.1349451123245; Fri, 05 Oct 2012 08:32:03 -0700 (PDT) Received: from localhost.localdomain (cpc1-aztw13-0-0-cust473.18-1.cable.virginmedia.com. [77.102.241.218]) by mx.google.com with ESMTPS id w8sm2906148wif.4.2012.10.05.08.32.01 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 05 Oct 2012 08:32:02 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: arnd@arndb.de, linus.walleij@stericsson.com, Lee Jones , Samuel Ortiz Subject: [PATCH 03/10] mfd: Correct copy and paste mistake in stmpe Date: Fri, 5 Oct 2012 16:31:39 +0100 Message-Id: <1349451107-8009-4-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1349451107-8009-1-git-send-email-lee.jones@linaro.org> References: <1349451107-8009-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQnzVo9/jnmZ3LBi6Yv8zB3++rAbqzCVHG0T8SeeQfOJkuEm+s9VkV3DsGv4l1fvisSJxUX9 When specifying IRQ numbers for the stmpe1601, IRQ defines for the stmpe24xx were used instead. Fortunately, the defined numbers are the same, hence why it survived testing. This fix is merely an aesthetic one. Cc: Samuel Ortiz Acked-by: Linus Walleij Signed-off-by: Lee Jones --- drivers/mfd/stmpe.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/mfd/stmpe.c b/drivers/mfd/stmpe.c index 5c8d8f2..e50ebdf 100644 --- a/drivers/mfd/stmpe.c +++ b/drivers/mfd/stmpe.c @@ -519,12 +519,12 @@ static const u8 stmpe1601_regs[] = { static struct stmpe_variant_block stmpe1601_blocks[] = { { .cell = &stmpe_gpio_cell, - .irq = STMPE24XX_IRQ_GPIOC, + .irq = STMPE1601_IRQ_GPIOC, .block = STMPE_BLOCK_GPIO, }, { .cell = &stmpe_keypad_cell, - .irq = STMPE24XX_IRQ_KEYPAD, + .irq = STMPE1601_IRQ_KEYPAD, .block = STMPE_BLOCK_KEYPAD, }, };