From patchwork Mon Nov 5 15:10:32 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 1698421 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 080633FCA5 for ; Mon, 5 Nov 2012 15:13:37 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TVOKk-0005fg-47; Mon, 05 Nov 2012 15:11:26 +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 1TVOKH-0005Wy-Iy for linux-arm-kernel@lists.infradead.org; Mon, 05 Nov 2012 15:10:59 +0000 Received: by mail-we0-f177.google.com with SMTP id u50so2589568wey.36 for ; Mon, 05 Nov 2012 07:10:56 -0800 (PST) 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=mfLkNpyzJx8Jk9UdNge5hAss7J9eBpJg6Bytk+W/ciw=; b=FI738aB7dxa0yhvIW4d9FcthIW4HAGbX3wSw537P+UTNZW4d6hsN1q4g9rhpyFc4pl hLAwpvScO5MTDyTTUDrNmwt3po1CU7IYCgUbz+o+fepgmCzMqn5scvwJmPhB50jwvMVg jD6Q+Hru1km28e8PRtNrBYXNFjQIMGvU6aAXQ9WTrPkOuoOr2mODWlXEgnOAMh+EnzOm 9HU7N/W7puK/kVQ20ixLhK7rOb4+1zGR4Ij3vxAmYUukjE/zX9uynyuH0vwaTcJp3NsN ff3sxJDF/cVgMga4GjWZRtJmQXg/ZvD+0Cp/CLriaCXvIW3Wt0KIAVJuecET5kKRtJaL lL/A== Received: by 10.216.226.154 with SMTP id b26mr3051276weq.166.1352128256523; Mon, 05 Nov 2012 07:10:56 -0800 (PST) Received: from laptop.vlan14.pylonone.local (78.Red-88-2-49.staticIP.rima-tde.net. [88.2.49.78]) by mx.google.com with ESMTPS id ea9sm12275388wib.11.2012.11.05.07.10.54 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 05 Nov 2012 07:10:55 -0800 (PST) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, sameo@linux.intel.com Subject: [PATCH 4/8] mfd: Correct copy and paste mistake in stmpe Date: Mon, 5 Nov 2012 16:10:32 +0100 Message-Id: <1352128236-11554-5-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1352128236-11554-1-git-send-email-lee.jones@linaro.org> References: <1352128236-11554-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQnGoYHJ2cTpdLdxqVSDC409tUiDrqjawyCSmkeXjX3hcIhmUjsXZiH8v/1WjQ3+6pqicJmu X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121105_101058_012249_8B1312D9 X-CRM114-Status: GOOD ( 13.82 ) 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 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: Arnd Bergmann 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, }, };