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: 12668 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 8AF1323EF8 for ; Mon, 5 Nov 2012 15:10:58 +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 43932A19A01 for ; Mon, 5 Nov 2012 15:10:58 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so7810038iej.11 for ; Mon, 05 Nov 2012 07:10:58 -0800 (PST) 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=mfLkNpyzJx8Jk9UdNge5hAss7J9eBpJg6Bytk+W/ciw=; b=U1y8Pzul90KVIIxCdlgXj4KuicX3WctfcloLki2EgNfxlIUQXyWHUqvOAhTfmrStEG 3p2wVLVWP3D9AOjX3pn/vM0mzkQo+K+s2iicHel+i+mgruIPesfpc13Q57kJeCore+UX x74hEnExzBvSopivfWvglfd8O/ysjwvC8fl0TXIVjDKBGeCZG4EwfQ8mYmMPDfD4VfR/ /f14xwDTNqMBkJgEEhKYn1iKnFiMTsOfsoTXfRMvZOTcURjb75NNCE2jEjhoJI5CelYB +RVz6719htOysd6s29GtLixOIOrK9XYshwv8Sm1SUBr4WOzpaO0aReGmnlhV8kDeRhKk T9Nw== Received: by 10.50.40.166 with SMTP id y6mr5161613igk.57.1352128258069; Mon, 05 Nov 2012 07:10:58 -0800 (PST) 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.67.148 with SMTP id n20csp231242igt; Mon, 5 Nov 2012 07:10:57 -0800 (PST) Received: by 10.181.11.163 with SMTP id ej3mr13702442wid.11.1352128257023; Mon, 05 Nov 2012 07:10:57 -0800 (PST) Received: from mail-wg0-f52.google.com (mail-wg0-f52.google.com [74.125.82.52]) by mx.google.com with ESMTPS id x77si2148675wen.146.2012.11.05.07.10.56 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 05 Nov 2012 07:10:57 -0800 (PST) Received-SPF: neutral (google.com: 74.125.82.52 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=74.125.82.52; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.52 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-f52.google.com with SMTP id fg15so3732268wgb.21 for ; Mon, 05 Nov 2012 07:10:56 -0800 (PST) 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 Cc: arnd@arndb.de, linus.walleij@stericsson.com, Lee Jones 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: ALoCoQkL1PeUZlKCLd/X+zPimgcdFVtxgXV8VNNg1vHHH8Yvi53DwbYjCkI2lFXGct71vuZWNq14 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, }, };