From patchwork Wed Aug 8 12:54:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 10586 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 01D5C23E00 for ; Wed, 8 Aug 2012 12:55:14 +0000 (UTC) Received: from mail-yx0-f180.google.com (mail-yx0-f180.google.com [209.85.213.180]) by fiordland.canonical.com (Postfix) with ESMTP id C629CA18141 for ; Wed, 8 Aug 2012 12:55:13 +0000 (UTC) Received: by mail-yx0-f180.google.com with SMTP id q6so709714yen.11 for ; Wed, 08 Aug 2012 05:55:13 -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-provags-id:x-gm-message-state; bh=FKPeyG0esh26Y46byKantGwBec/RLu7p4BvgK5HfLZ8=; b=GDYzpOi1nfQ1gIBpzs8xwXwASbpVyq/M07l5ywGH41NkQN70lYjUldkQA6UQEq+KSO vuABmF6hKaB2vHYZlwcHz9c4h2HnKbntBs8Um04Q1bXaMkc4t6pg63Hf3gyCyFoDuuEI aUmkXMG9gitQfe166eEavxlU2gTXbhJp+7/LWUcc2mgzx8tsaeOobvE0/ZeLOrt1uquS AJrcL8nPm/BXHZ/6KyjOD7Pn3YtsOFq7Tl+hBQWo6TggFYoi8pcT8MGKNOv0gUeqR8+u GfJUly9MzIiZbLOLZtVJ2vlV2t+yjpX5wCKXJS9lfJokZ1x8I8WZvF378r2KLCzWjw/O 8UiQ== Received: by 10.42.75.73 with SMTP id z9mr13937072icj.46.1344430512557; Wed, 08 Aug 2012 05:55:12 -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.200 with SMTP id ew8csp605857igc; Wed, 8 Aug 2012 05:55:11 -0700 (PDT) Received: by 10.205.134.137 with SMTP id ic9mr7532940bkc.57.1344430511319; Wed, 08 Aug 2012 05:55:11 -0700 (PDT) Received: from moutng.kundenserver.de (moutng.kundenserver.de. [212.227.126.171]) by mx.google.com with ESMTP id hg2si23271566bkc.140.2012.08.08.05.55.10; Wed, 08 Aug 2012 05:55:11 -0700 (PDT) Received-SPF: neutral (google.com: 212.227.126.171 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) client-ip=212.227.126.171; Authentication-Results: mx.google.com; spf=neutral (google.com: 212.227.126.171 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) smtp.mail=arnd@arndb.de Received: from klappe2.boeblingen.de.ibm.com (deibp9eh1--blueice3n2.emea.ibm.com [195.212.29.180]) by mrelayeu.kundenserver.de (node=mreu1) with ESMTP (Nemesis) id 0M53xy-1Tx8hR2mPW-00yeri; Wed, 08 Aug 2012 14:55:00 +0200 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Cc: arm@kernel.org, linux-kernel@vger.kernel.org, Arnd Bergmann , stable@vger.kernel.org (v3.2+), Samuel Ortiz , Daniel Ribeiro , Haojian Zhuang Subject: [PATCH 1/6] ARM: pxa: remove irq_to_gpio from ezx-pcap driver Date: Wed, 8 Aug 2012 14:54:48 +0200 Message-Id: <1344430493-5304-2-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1344430493-5304-1-git-send-email-arnd@arndb.de> References: <1344430493-5304-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:rqDk1oevhZFHpj2gCM/Ha8RZEpFEFCT2B0PpzKHlCuy lxMaD2Brq0P5Qe5Cz3ul1FSo5/NiR5ytr8XfU0Kw6Sqhg5vrUU fyxwfCM6pfE2KleIPJp2I0KkGlVOdsYWO97Qh8kY/6jwI5fM1N ZC8rdZE5nHCHVr6xOat4pkdCMc+ZhJh3nfzIzlMv8cfmSCdbAX QirQY0UFE9pLMcbZimxWin7s7P1Y6fE7I5mZ/NOQd724HTrocI y47er7DMntMPhUu+BrGZ2R5Tp1IYXgJZV1UHg+5CY0N4bE88eS fL/t+HVonfmiMcz/P6dDx81jhQH1KTMaL9Mps1AlvTNAtwMK8I 8lx1B8mRbxqA8RgJ6nnRIvb88KWl/ytSGr4Mt8xAV0uRK5ib6+ 9F+XxOCdSe8MQ== X-Gm-Message-State: ALoCoQm+b1hnFpxhEv2djaPASoQiEvtS+yjA/CGg7JSH9vt0ayEoB0zUmSbBW7+MzKp3G95vhPH1 The irq_to_gpio function was removed from the pxa platform in linux-3.2, and this driver has been broken since. There is actually no in-tree user of this driver that adds this platform device, but the driver can and does get enabled on some platforms. Without this patch, building ezx_defconfig results in: drivers/mfd/ezx-pcap.c: In function 'pcap_isr_work': drivers/mfd/ezx-pcap.c:205:2: error: implicit declaration of function 'irq_to_gpio' [-Werror=implicit-function-declaration] Signed-off-by: Arnd Bergmann Cc: stable@vger.kernel.org (v3.2+) Cc: Samuel Ortiz Cc: Daniel Ribeiro Cc: Haojian Zhuang --- drivers/mfd/ezx-pcap.c | 2 +- include/linux/mfd/ezx-pcap.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/mfd/ezx-pcap.c b/drivers/mfd/ezx-pcap.c index 43a76c4..db662e2 100644 --- a/drivers/mfd/ezx-pcap.c +++ b/drivers/mfd/ezx-pcap.c @@ -202,7 +202,7 @@ static void pcap_isr_work(struct work_struct *work) } local_irq_enable(); ezx_pcap_write(pcap, PCAP_REG_MSR, pcap->msr); - } while (gpio_get_value(irq_to_gpio(pcap->spi->irq))); + } while (gpio_get_value(pdata->gpio)); } static void pcap_irq_handler(unsigned int irq, struct irq_desc *desc) diff --git a/include/linux/mfd/ezx-pcap.h b/include/linux/mfd/ezx-pcap.h index 40c37216..32a1b5c 100644 --- a/include/linux/mfd/ezx-pcap.h +++ b/include/linux/mfd/ezx-pcap.h @@ -16,6 +16,7 @@ struct pcap_subdev { struct pcap_platform_data { unsigned int irq_base; unsigned int config; + int gpio; void (*init) (void *); /* board specific init */ int num_subdevs; struct pcap_subdev *subdevs;