From patchwork Sat May 17 21:24:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joachim Eastwood X-Patchwork-Id: 4197161 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 7A0249F327 for ; Sat, 17 May 2014 21:24:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A435320351 for ; Sat, 17 May 2014 21:24:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C11D62028D for ; Sat, 17 May 2014 21:24:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751711AbaEQVY0 (ORCPT ); Sat, 17 May 2014 17:24:26 -0400 Received: from mail-lb0-f171.google.com ([209.85.217.171]:33977 "EHLO mail-lb0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751690AbaEQVYZ (ORCPT ); Sat, 17 May 2014 17:24:25 -0400 Received: by mail-lb0-f171.google.com with SMTP id 10so2929757lbg.2 for ; Sat, 17 May 2014 14:24:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=clh/b1yCjk9sGxdn5ChSg1uMfegyt8DRUP7MG9Z26NU=; b=BWaBc7hScEIypS8rDfWOskf3W86DxMpw9tQPnOfIJSEj0/lnoAkoLRB8Rk21JpXWK0 6RSy1+G4U95LIhBmkWJ2Frzo+NwcWMwZ7C/Y5Az4Vp3/hdeSb4FbxsEiHY4KISinqSv+ K/21JxrrpHAZ7NvwTN5199hjUjkVc/cH8ujc43yhPTxRxh4npVmb6dq7cgjjcArhaSOf fR7dmCG+H2hce150u8ZSxz9ob1iXuuO4bYvRZtyv038mx0FdAFGU0rWsNDlnIputn4MS 1Qnkeh6wd/pCfkHiVnBtTGY1Wda/jORzlFr8+N/0aqcjg6CTE6IxJm+G5snt95XWTP0C gweQ== X-Received: by 10.112.34.43 with SMTP id w11mr17386830lbi.31.1400361863343; Sat, 17 May 2014 14:24:23 -0700 (PDT) Received: from localhost.localdomain ([90.149.48.183]) by mx.google.com with ESMTPSA id cr6sm12524077lbb.19.2014.05.17.14.24.22 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 17 May 2014 14:24:22 -0700 (PDT) From: Joachim Eastwood To: illia.smyrnov@ti.com, dmitry.torokhov@gmail.com, tony@atomide.com Cc: linux-omap@vger.kernel.org, linux-input@vger.kernel.org, Joachim Eastwood Subject: [PATCH 1/2] ARM: OMAP2+: remove unused omap4-keypad file and code Date: Sat, 17 May 2014 23:24:10 +0200 Message-Id: <1400361851-32274-2-git-send-email-manabian@gmail.com> X-Mailer: git-send-email 1.8.0 In-Reply-To: <1400361851-32274-1-git-send-email-manabian@gmail.com> References: <1400361851-32274-1-git-send-email-manabian@gmail.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This has been unused since omap4 board files went away. Signed-off-by: Joachim Eastwood Acked-by: Tony Lindgren --- arch/arm/mach-omap2/devices.c | 33 --------------------------------- arch/arm/mach-omap2/omap4-keypad.h | 8 -------- 2 files changed, 41 deletions(-) delete mode 100644 arch/arm/mach-omap2/omap4-keypad.h diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index e58609b312c7..592ba0a0ecf3 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c @@ -18,7 +18,6 @@ #include #include #include -#include #include #include @@ -29,7 +28,6 @@ #include "iomap.h" #include "omap_hwmod.h" #include "omap_device.h" -#include "omap4-keypad.h" #include "soc.h" #include "common.h" @@ -255,37 +253,6 @@ static inline void omap_init_camera(void) #endif } -int __init omap4_keyboard_init(struct omap4_keypad_platform_data - *sdp4430_keypad_data, struct omap_board_data *bdata) -{ - struct platform_device *pdev; - struct omap_hwmod *oh; - struct omap4_keypad_platform_data *keypad_data; - unsigned int id = -1; - char *oh_name = "kbd"; - char *name = "omap4-keypad"; - - oh = omap_hwmod_lookup(oh_name); - if (!oh) { - pr_err("Could not look up %s\n", oh_name); - return -ENODEV; - } - - keypad_data = sdp4430_keypad_data; - - pdev = omap_device_build(name, id, oh, keypad_data, - sizeof(struct omap4_keypad_platform_data)); - - if (IS_ERR(pdev)) { - WARN(1, "Can't build omap_device for %s:%s.\n", - name, oh->name); - return PTR_ERR(pdev); - } - oh->mux = omap_hwmod_mux_init(bdata->pads, bdata->pads_cnt); - - return 0; -} - #if defined(CONFIG_OMAP2PLUS_MBOX) || defined(CONFIG_OMAP2PLUS_MBOX_MODULE) static inline void __init omap_init_mbox(void) { diff --git a/arch/arm/mach-omap2/omap4-keypad.h b/arch/arm/mach-omap2/omap4-keypad.h deleted file mode 100644 index 20de0d5a7e77..000000000000 --- a/arch/arm/mach-omap2/omap4-keypad.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef ARCH_ARM_PLAT_OMAP4_KEYPAD_H -#define ARCH_ARM_PLAT_OMAP4_KEYPAD_H - -struct omap_board_data; - -extern int omap4_keyboard_init(struct omap4_keypad_platform_data *, - struct omap_board_data *); -#endif