From patchwork Mon Feb 4 15:40:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haojian Zhuang X-Patchwork-Id: 14540 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 72A4623F8B for ; Mon, 4 Feb 2013 15:42:15 +0000 (UTC) Received: from mail-vc0-f173.google.com (mail-vc0-f173.google.com [209.85.220.173]) by fiordland.canonical.com (Postfix) with ESMTP id 09F8EA192C1 for ; Mon, 4 Feb 2013 15:42:14 +0000 (UTC) Received: by mail-vc0-f173.google.com with SMTP id fy7so4011366vcb.32 for ; Mon, 04 Feb 2013 07:42:14 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state; bh=SQB76TsvkZ0DIx++xVCE9tcyaq2Z03fCUQ7RxmEJSN8=; b=ZueFFKo7hrb8ykzd6Y3crU482q7UoGEbDflaU99OsL1gVNrcp8+f+na0Er2wHDDWIJ vaqUTbfpUN8L2MBpYnkJPdy3j9RgBaTEV4RSXKSd7ZArhsrukq/3jtTl4l/e98BNsvf2 gPo1XMajCOqG/gELrkLtBFemLnCRpjnH08jG8JibakzpRQl39aIkluXlvd2255dpJC9C BDspYahZ+hDeGH3u12avs0BjuLQsYyIWnKEJKAa7eSGNrYRYYa3cZpSQWoPFX1YKDXCr L/NpXBpR3sTAQpUzCoEKVcMU3a9z6FKxnHbp5U4JSgTLO4HeuS6o8SE3FqhxMcIMp6IT ehvQ== X-Received: by 10.58.232.226 with SMTP id tr2mr18850292vec.48.1359992534494; Mon, 04 Feb 2013 07:42:14 -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.58.252.8 with SMTP id zo8csp92945vec; Mon, 4 Feb 2013 07:42:14 -0800 (PST) X-Received: by 10.50.169.6 with SMTP id aa6mr7295131igc.1.1359992533834; Mon, 04 Feb 2013 07:42:13 -0800 (PST) Received: from mail-pa0-f50.google.com (mail-pa0-f50.google.com [209.85.220.50]) by mx.google.com with ESMTPS id t5si17990766pay.18.2013.02.04.07.42.13 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 04 Feb 2013 07:42:13 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.50 is neither permitted nor denied by best guess record for domain of haojian.zhuang@linaro.org) client-ip=209.85.220.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.50 is neither permitted nor denied by best guess record for domain of haojian.zhuang@linaro.org) smtp.mail=haojian.zhuang@linaro.org Received: by mail-pa0-f50.google.com with SMTP id fa11so845813pad.23 for ; Mon, 04 Feb 2013 07:42:13 -0800 (PST) X-Received: by 10.66.74.197 with SMTP id w5mr54049418pav.60.1359992533272; Mon, 04 Feb 2013 07:42:13 -0800 (PST) Received: from localhost.localdomain ([67.198.145.34]) by mx.google.com with ESMTPS id d1sm22254330pav.6.2013.02.04.07.42.09 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 04 Feb 2013 07:42:12 -0800 (PST) From: Haojian Zhuang To: sameo@linux.intel.com, qingx@marvell.com, grant.likely@secretlab.ca, rob.herring@calxeda.com, cxie4@marvell.com, linux-kernel@vger.kernel.org, devicetree-discuss@lists.ozlabs.org Cc: patches@linaro.org Subject: [PATCH 3/6] mfd: max8925: fix onkey driver irq base Date: Mon, 4 Feb 2013 23:40:44 +0800 Message-Id: <1359992448-22229-3-git-send-email-haojian.zhuang@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1359992448-22229-1-git-send-email-haojian.zhuang@linaro.org> References: <1359992448-22229-1-git-send-email-haojian.zhuang@linaro.org> X-Gm-Message-State: ALoCoQnavT3GQpsPsr4AHQ7oD09luDHkNtgE8nWnuKqLzT/EvB7JHUHsRdXRpFgH1q81TiPIb1gv From: Qing Xu update onkey driver's irq base, it should get from max8925, but not save in a private value Signed-off-by: Qing Xu Acked-by: Dmitry Torokhov --- drivers/input/misc/max8925_onkey.c | 3 --- drivers/mfd/max8925-core.c | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/input/misc/max8925_onkey.c b/drivers/input/misc/max8925_onkey.c index 369a39d..f9179b2 100644 --- a/drivers/input/misc/max8925_onkey.c +++ b/drivers/input/misc/max8925_onkey.c @@ -100,9 +100,6 @@ static int max8925_onkey_probe(struct platform_device *pdev) input->dev.parent = &pdev->dev; input_set_capability(input, EV_KEY, KEY_POWER); - irq[0] += chip->irq_base; - irq[1] += chip->irq_base; - error = request_threaded_irq(irq[0], NULL, max8925_onkey_handler, IRQF_ONESHOT, "onkey-down", info); if (error < 0) { diff --git a/drivers/mfd/max8925-core.c b/drivers/mfd/max8925-core.c index d7abbb3..f0cc402 100644 --- a/drivers/mfd/max8925-core.c +++ b/drivers/mfd/max8925-core.c @@ -867,7 +867,7 @@ int max8925_device_init(struct max8925_chip *chip, ret = mfd_add_devices(chip->dev, 0, &onkey_devs[0], ARRAY_SIZE(onkey_devs), - NULL, 0, NULL); + NULL, chip->irq_base, NULL); if (ret < 0) { dev_err(chip->dev, "Failed to add onkey subdev\n"); goto out_dev;