Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp582228ybz; Wed, 15 Apr 2020 14:30:55 -0700 (PDT) X-Google-Smtp-Source: APiQypLfL/ZVa37SxvLYTLcO0Wn5nB2lVkHsFwSKNSki/wtypeeknAT/+Cdpu96jNWxMil11nON7 X-Received: by 2002:aa7:d518:: with SMTP id y24mr3575313edq.222.1586986255624; Wed, 15 Apr 2020 14:30:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1586986255; cv=none; d=google.com; s=arc-20160816; b=EXiE9tgGHdodsCKKaV0Z1EfLpICHRSJu+/h+Us436zyKRaixYojK31Lwj1QQMcxeRW BuW6mw91nUWe6m7IIHlJ0otz3Hp7KQEQZU+oZLHJKHFvy3T3sB38anI6zxv+A43Y+6hq Zvl6PvWolPI6YEwn8ckLtxNv4uyTo+XWoRvB+oUUxBNbzElWLeuP0bLOrxC0wXDSgstk fFt59B7voZ3PiPBd18ZIykdVaGsXvYsHL//HRFtisukRLB5llo/sWoXxDbMOVYleZ+0p jtko/cDWoyBgFSVUlUvxXuw0CBTNrkoEbE05C82AKyhwMDD8xUTIWc/Dhyam3VQQeA4c /57A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=aiwmdPUqZZ/l09CM4xUEGjG1gIInn5e5YeaJYZVGaLE=; b=poCQQmNdtT1e4Yb35p/PF/ldk0UjP5INGaSLJwv+E/vrBgfq/3N8XpoxYJnE2izERC DQnlLSQpLBHSDpTP9w/TyeK86bSCOFqXn2djt3/vF3tzv2ljS6GDpNjUurEA2BBEusRs wxZatccT3gwjmBML/487Xm2ZtpzRv8sd43BTnBzov/L5S3CVU+atDQHtKiAf8+t3h+ZW 7rX7y2G4Qe57gzyXbG0BUfdg+lJoopVHdHetFNlItyESOfSOUInnWNBKsWEoZPmMbSEw K0/ntxZWGaLyIgUJOVnNTcJDi+GrLIkH3QNgMxBNihJaKrDfa0ZSMcZYFm/LPl86oL1p XJow== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=collabora.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id bf18si2166508edb.35.2020.04.15.14.30.32; Wed, 15 Apr 2020 14:30:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2502521AbgDNNDu (ORCPT + 99 others); Tue, 14 Apr 2020 09:03:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53172 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S2502515AbgDNNDn (ORCPT ); Tue, 14 Apr 2020 09:03:43 -0400 Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e3e3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DFAB9C061A0C; Tue, 14 Apr 2020 06:03:42 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: ezequiel) with ESMTPSA id E67972A1860 From: Ezequiel Garcia To: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Cc: kernel@collabora.com, Hans Verkuil , Mauro Carvalho Chehab , Helen Koike , Ezequiel Garcia Subject: [PATCH] media: Kconfig: Don't expose API options Date: Tue, 14 Apr 2020 10:02:10 -0300 Message-Id: <20200414130210.18970-1-ezequiel@collabora.com> X-Mailer: git-send-email 2.26.0.rc2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org There is no need to expose API options; instead, drivers that support a given API are expected to just select it. Happily, this is currently the case, so simply stop exposing the options. Signed-off-by: Ezequiel Garcia --- drivers/media/Kconfig | 2 +- drivers/media/mc/Kconfig | 3 +-- drivers/media/v4l2-core/Kconfig | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig index a8def1591352..eef4c6761ffb 100644 --- a/drivers/media/Kconfig +++ b/drivers/media/Kconfig @@ -173,7 +173,7 @@ config VIDEO_DEV radio devices and by some input devices. config MEDIA_CONTROLLER - bool "Media Controller API" + bool default MEDIA_CAMERA_SUPPORT || MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT || MEDIA_PLATFORM_SUPPORT help Enable the media controller API used to query media devices internal diff --git a/drivers/media/mc/Kconfig b/drivers/media/mc/Kconfig index 002a918c4c75..0cdf885ce24d 100644 --- a/drivers/media/mc/Kconfig +++ b/drivers/media/mc/Kconfig @@ -2,7 +2,6 @@ # # Media controller -# Selectable only for webcam/grabbers, as other drivers don't use it # config MEDIA_CONTROLLER_DVB @@ -14,7 +13,7 @@ config MEDIA_CONTROLLER_DVB This is currently experimental. config MEDIA_CONTROLLER_REQUEST_API - bool "Enable Media controller Request API (EXPERIMENTAL)" + bool depends on MEDIA_CONTROLLER && STAGING_MEDIA help DO NOT ENABLE THIS OPTION UNLESS YOU KNOW WHAT YOU'RE DOING. diff --git a/drivers/media/v4l2-core/Kconfig b/drivers/media/v4l2-core/Kconfig index 3fa75352d04c..d034185856bb 100644 --- a/drivers/media/v4l2-core/Kconfig +++ b/drivers/media/v4l2-core/Kconfig @@ -17,7 +17,7 @@ config VIDEO_V4L2_I2C default y config VIDEO_V4L2_SUBDEV_API - bool "V4L2 sub-device userspace API" + bool depends on VIDEO_DEV && MEDIA_CONTROLLER help Enables the V4L2 sub-device pad-level userspace API used to configure -- 2.26.0.rc2