From patchwork Wed Aug 19 11:19:58 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Martinez Canillas X-Patchwork-Id: 7037121 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A89DE9F372 for ; Wed, 19 Aug 2015 11:21:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C6013207A8 for ; Wed, 19 Aug 2015 11:21:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EEE502077D for ; Wed, 19 Aug 2015 11:21:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753898AbbHSLVR (ORCPT ); Wed, 19 Aug 2015 07:21:17 -0400 Received: from lists.s-osg.org ([54.187.51.154]:58478 "EHLO lists.s-osg.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932313AbbHSLU5 (ORCPT ); Wed, 19 Aug 2015 07:20:57 -0400 Received: from localhost.localdomain (95.111.23.95.dynamic.jazztel.es [95.23.111.95]) by lists.s-osg.org (Postfix) with ESMTPSA id 9E63A4632A; Wed, 19 Aug 2015 04:20:54 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Gwendal Grignou , Doug Anderson , Bartlomiej Zolnierkiewicz , Wolfram Sang , Dmitry Torokhov , Lee Jones , Geert Uytterhoeven , Olof Johansson , Javier Martinez Canillas , linux-input@vger.kernel.org Subject: [PATCH 6/6] Input: Replace KEYBOARD_CROS_EC dependency Date: Wed, 19 Aug 2015 13:19:58 +0200 Message-Id: <1439983198-4696-7-git-send-email-javier@osg.samsung.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1439983198-4696-1-git-send-email-javier@osg.samsung.com> References: <1439983198-4696-1-git-send-email-javier@osg.samsung.com> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-7.5 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 The ChromeOS EC keyboard driver config depend on CROS_EC_PROTO but MFD_CROS_EC select CROS_EC_PROTO instead. Mixing select and depends on is bad practice as it may lead to circular Kconfig dependencies. Since the platform device that is matched with the keyboard driver is registered by the ChromeOS EC mfd driver, KEYBOARD_CROS_EC really should depend on MFD_CROS_EC. And because this config option selects CROS_EC_PROTO, that dependency is met as well. So make the driver to depend on MFD_CROS_EC instead of CROS_EC_PROTO. Signed-off-by: Javier Martinez Canillas --- drivers/input/keyboard/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig index da53ae6a9334..2e80107ff630 100644 --- a/drivers/input/keyboard/Kconfig +++ b/drivers/input/keyboard/Kconfig @@ -689,7 +689,7 @@ config KEYBOARD_W90P910 config KEYBOARD_CROS_EC tristate "ChromeOS EC keyboard" select INPUT_MATRIXKMAP - depends on CROS_EC_PROTO + depends on MFD_CROS_EC help Say Y here to enable the matrix keyboard used by ChromeOS devices and implemented on the ChromeOS EC. You must enable one bus option