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: 1554111 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id DD176DF24C for ; Fri, 5 Oct 2012 15:37:07 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TK9ui-0003AM-H9; Fri, 05 Oct 2012 15:34:09 +0000 Received: from mail-we0-f177.google.com ([74.125.82.177]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TK9tj-0002tp-Pl for linux-arm-kernel@lists.infradead.org; Fri, 05 Oct 2012 15:33:08 +0000 Received: by mail-we0-f177.google.com with SMTP id u50so1160697wey.36 for ; Fri, 05 Oct 2012 08:32:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=6eVBZtZwtvJelUWYlek7JjBCbauqOQFtIKVydkgneH0=; b=pwJJ6nUUEkHUOfW/1lr9iplYVJoUqkver/KVwfdYBgAtqTSMCVIJS7hBOiWu7Qgso2 kMIgA2b40YePdGc4JA6el/AwpTjzJV9OcJig1w/wQZ5CqqswpSvHHddlnFeOKxAn4GS/ 67hDj9ChVRjyVImmY+6ODlmt1d61SpPhn61lk5kWRcZyqZjO7YcsMTAYQYyJ32GEkvWn ZECkESKb9avhHzf+76Hedbb8QGofmHGW4z41JXILaCZDVbYwV8JXecBfajIETOXcyrMd 6fZOC7bOFoItYdo33h1M2SljoklFBUxOVSlI5sAZpNUArh8eQvJzdZTTLyg9OhRiMrwt AtKw== 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 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: ALoCoQklIX4FrOVABkg+TJGOeLsDB3KXmYC9ltl7pOezsX4Ny/TTuzQaov/4+GAfnzjxwEtvsuoN X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [74.125.82.177 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Lee Jones , linus.walleij@stericsson.com, arnd@arndb.de, Samuel Ortiz X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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, }, };