From patchwork Fri Sep 26 12:57:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhangfei Gao X-Patchwork-Id: 4982171 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 70A29BEEA6 for ; Fri, 26 Sep 2014 13:00:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 91E5D2020F for ; Fri, 26 Sep 2014 13:00:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9464A2020E for ; Fri, 26 Sep 2014 13:00:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754111AbaIZNAQ (ORCPT ); Fri, 26 Sep 2014 09:00:16 -0400 Received: from mail-pa0-f41.google.com ([209.85.220.41]:43518 "EHLO mail-pa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753984AbaIZNAP (ORCPT ); Fri, 26 Sep 2014 09:00:15 -0400 Received: by mail-pa0-f41.google.com with SMTP id fa1so4753860pad.0 for ; Fri, 26 Sep 2014 06:00:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=/RNGSeDcwyDqoj8lz6w6+01u44DeynT6ycnKvhwSg/4=; b=QO2Kajws1khcZ2au4p9Gvth9QDLPG99gU/rKQR3N221IL8G3nJ8ZZeJdTsC//tF871 cbV1KKuHiC7U3tXo5acLJnUP1rXRs3UBUjNqGWgq5DTrRv0LL3ypeX1+toi1IbCgyG8U mL/c5bVDgG+CJCSMuMVTcDWQ6kEpjBeR/kmAa+Anr0FrYh7+aZk8ylr/11fSOEBsTLlu zYkqQDzO7fZArckacqDNcGDf3hsZjgz5cQz1+ZHMDh4lY1o1cwyDizUA9071xWBaTDHE BRVEoBjyMfYs+JHkZUQ8S8dvq7rJumyZoP7yUCx3UJkVfibSquJYCzUpOZjaAT1w+RzR B9VQ== X-Gm-Message-State: ALoCoQnLdxUxd60PGijkERriq/Ej22hkEbKtA1ZHPAQ2Y+YAg7Y/ysQcQZ1oM4Mklt54j9MWbC0O X-Received: by 10.68.235.105 with SMTP id ul9mr31194397pbc.3.1411736414830; Fri, 26 Sep 2014 06:00:14 -0700 (PDT) Received: from localhost.localdomain ([60.168.115.49]) by mx.google.com with ESMTPSA id qa1sm4922202pbb.29.2014.09.26.06.00.06 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 26 Sep 2014 06:00:13 -0700 (PDT) From: Zhangfei Gao To: m.chehab@samsung.com Cc: linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org, Zhangfei Gao Subject: [PATCH] [media] rc: fix hix5hd2 compile-test issue Date: Fri, 26 Sep 2014 20:57:30 +0800 Message-Id: <1411736250-29252-1-git-send-email-zhangfei.gao@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1411571401-30664-1-git-send-email-zhangfei.gao@linaro.org> References: <1411571401-30664-1-git-send-email-zhangfei.gao@linaro.org> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 Add dependence to solve build error in arch like ia64 error: implicit declaration of function 'readl_relaxed' & 'writel_relaxed' Change CONFIG_PM to CONFIG_PM_SLEEP to solve warning: 'hix5hd2_ir_suspend' & 'hix5hd2_ir_resume' defined but not used Reported-by: Fengguang Wu Signed-off-by: Zhangfei Gao --- drivers/media/rc/Kconfig | 2 +- drivers/media/rc/ir-hix5hd2.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/media/rc/Kconfig b/drivers/media/rc/Kconfig index 8ce08107a69d..28fb2cb34e8d 100644 --- a/drivers/media/rc/Kconfig +++ b/drivers/media/rc/Kconfig @@ -166,7 +166,7 @@ config IR_ENE config IR_HIX5HD2 tristate "Hisilicon hix5hd2 IR remote control" - depends on RC_CORE + depends on RC_CORE && ARM help Say Y here if you want to use hisilicon hix5hd2 remote control. To compile this driver as a module, choose M here: the module will be diff --git a/drivers/media/rc/ir-hix5hd2.c b/drivers/media/rc/ir-hix5hd2.c index 94967d0e0478..c1d8527ace92 100644 --- a/drivers/media/rc/ir-hix5hd2.c +++ b/drivers/media/rc/ir-hix5hd2.c @@ -16,11 +16,6 @@ #include #include -/* Allow the driver to compile on all architectures */ -#ifndef writel_relaxed -# define writel_relaxed writel -#endif - #define IR_ENABLE 0x00 #define IR_CONFIG 0x04 #define CNT_LEADS 0x08 @@ -294,7 +289,7 @@ static int hix5hd2_ir_remove(struct platform_device *pdev) return 0; } -#ifdef CONFIG_PM +#ifdef CONFIG_PM_SLEEP static int hix5hd2_ir_suspend(struct device *dev) { struct hix5hd2_ir_priv *priv = dev_get_drvdata(dev);