Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp923571pxu; Wed, 6 Jan 2021 07:55:05 -0800 (PST) X-Google-Smtp-Source: ABdhPJwE33ybp+q+WK7UOsjxEBuN90W2Xm81xC4uu+NbP/zfiPMbm/TbQ/9gIR1nyleSs+daxVYz X-Received: by 2002:a05:6402:4c1:: with SMTP id n1mr4407607edw.66.1609948505045; Wed, 06 Jan 2021 07:55:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1609948505; cv=none; d=google.com; s=arc-20160816; b=f6QLJMbHiRyDE60OzMjfImSqbtNxupgeaZ8UTUhd3c/C0Q+IAZSNcm7o19hi9mkYIM TyJkQvq74OA01XbPy7eG4KCWIJpioSRRMuthFqM7FU69PSFoLZJ9OJL9cdRnteNKjKU/ pMcTj+fYcdMLAYsjYGT2v3ZJCYPQZI3OnDWoTWBxGojNZ4QecYmIJP8YMnSn9McbjaY9 xT2ca8XbGc6AQOtl/M7XBLOhY3u+Tgc5FjV2XinsxJOb5temK5K7qJQgin2/ZAOscA35 BN0udWS8bdFcD7yJ+gEfIYOweD6NBxt+9khjKOZ4fi8XpmmhiH1oRtgWJavKssKx4ykH kwIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:mime-version:message-id:date :sender:dkim-signature; bh=0QeHafaN+6pva6XnlDmaJHR7Sw5XHBtBnuyuxZTaO/k=; b=z172k5HEe1MIgPov5DQWUte9UBSuiCotJwbvLwqyfI+I8kFu1dMpZ8EEBI1STtIotG iReNc2cwxp16K9i89er/72gOt0GAYBI9vSxh7KfpSYSNbWbwH6piK9RlLBABBtw12Ppb /JmtXgznTmiuOPwMrnx1DEATppKbrxbkLt69f0zvpy/5bvQzTtKVUL0rLfIDz4xjtUVC p41/Ryd3uHVNugQo6NY/bz48z2Ono4vN1Yu+P7RujOucfpiqWfLzd1fTp2m/tqT3NPL8 49qC9eH3GHI3GGVkDELffrEcBjuHUKDMjMCeSFmzFnIMBe54t2y32whvaUQdLGxonqn4 tekQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=mTK7oXr4; 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=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id bz23si1004085ejc.600.2021.01.06.07.54.41; Wed, 06 Jan 2021 07:55:05 -0800 (PST) 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; dkim=pass header.i=@google.com header.s=20161025 header.b=mTK7oXr4; 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=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726768AbhAFPwr (ORCPT + 99 others); Wed, 6 Jan 2021 10:52:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41784 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726220AbhAFPwr (ORCPT ); Wed, 6 Jan 2021 10:52:47 -0500 Received: from mail-wr1-x449.google.com (mail-wr1-x449.google.com [IPv6:2a00:1450:4864:20::449]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A3978C06134D for ; Wed, 6 Jan 2021 07:52:06 -0800 (PST) Received: by mail-wr1-x449.google.com with SMTP id g17so1492424wrr.11 for ; Wed, 06 Jan 2021 07:52:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:message-id:mime-version:subject:from:to:cc; bh=0QeHafaN+6pva6XnlDmaJHR7Sw5XHBtBnuyuxZTaO/k=; b=mTK7oXr4IVYP2JsFQR9Q/8mLdfi9OxywhsKdo/JeZLzUYaqEgbyBm++04dMvQo921c cxuiHV3l5BcGtABo8zKr68L9vN6CA2zX9jTjIMiCrJ15DPbGGCypB7N+2Usqy20dlzO6 A/kmCUEMrZts8I/3cZZuLE/s/8xZQdRgpgcYjYbC0oZ5ltKVV5getwcnajMK2bNtClNK VXMxg6QXeezfOGPaT4FNkA+MrYccRnEaOSkCejwhOKWdhV1PD1Tje1/EOzFL5DZY6P0F 5zFKMFmQCfA8uBYw2V0gt6m/RHqPfFDgZRl60gigSIY095J/fW3g0BYTBcnALOQNfZmF Z/PQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:message-id:mime-version:subject:from :to:cc; bh=0QeHafaN+6pva6XnlDmaJHR7Sw5XHBtBnuyuxZTaO/k=; b=cyMLyoqCNY4QBKiXL4l9jbJezqX8auB7m0etvAL2Uv3lcaBUVvbejjZMQd4CrunWM9 hz26boUH+3s24xBVWT79KTijbXyTE90T7o4xeOXYm+Uvy90zdlfbtIqm2AASDrI3XqlJ RXf200TEPkkXPZT/Lz3lQgxVMo1JrrLGlitqHig1i16N7nZJZ/1SR5rITrE3ex673dlw cKkEB4di/xExTbkJ8OMrgNm+OOA4PogI2h8Vj6T1AdyLsK/o0lV43E2xh/BQt4umjKyM 1bzvAc5b8t2ADEiPf0TJt+zJvLPnf58pOfv2VvJAjN81BeQH8yXME77TYOqbbn0woOvO 7n0A== X-Gm-Message-State: AOAM531ZtR4P5eeRE29xZdyzUCkrjOOsdI92HcIVJu6lbI8tzgiBndu6 nMF19NO8r3opv9AUV1Ix6GMB5vAFjmPdmWJ7JnruYId6nXQxFS5Lv68NSdDIDK5yCs+ox9o98kG r8G90tb2hix9xN32fS7ZZcQ3DvIm34so5M6Mt9RTGiPVUVwwO3EVfMqt/MGK7GL8GjhCrJUOeV9 w= Sender: "maennich via sendgmr" X-Received: from lux.lon.corp.google.com ([2a00:79e0:d:210:7220:84ff:fe09:a3aa]) (user=maennich job=sendgmr) by 2002:a5d:4d4f:: with SMTP id a15mr4856061wru.315.1609948325216; Wed, 06 Jan 2021 07:52:05 -0800 (PST) Date: Wed, 6 Jan 2021 15:52:01 +0000 Message-Id: <20210106155201.2845319-1-maennich@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.29.2.729.g45daf8777d-goog Subject: [PATCH] staging: ION: remove some references to CONFIG_ION From: Matthias Maennich To: linux-kernel@vger.kernel.org Cc: kernel-team@android.com, maennich@google.com, Greg Kroah-Hartman , Hridya Valsaraju , Rob Herring , linux-media@vger.kernel.org, devel@driverdev.osuosl.org Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org With commit e722a295cf49 ("staging: ion: remove from the tree"), ION and its corresponding config CONFIG_ION is gone. Remove stale references from drivers/staging/media/atomisp/pci and from the recommended Android kernel config. Fixes: e722a295cf49 ("staging: ion: remove from the tree") Cc: Greg Kroah-Hartman Cc: Hridya Valsaraju Cc: Rob Herring Cc: linux-media@vger.kernel.org Cc: devel@driverdev.osuosl.org Signed-off-by: Matthias Maennich --- .../media/atomisp/pci/atomisp_subdev.c | 20 ------------------- kernel/configs/android-recommended.config | 1 - 2 files changed, 21 deletions(-) diff --git a/drivers/staging/media/atomisp/pci/atomisp_subdev.c b/drivers/staging/media/atomisp/pci/atomisp_subdev.c index 52b9fb18c87f..b666cb23e5ca 100644 --- a/drivers/staging/media/atomisp/pci/atomisp_subdev.c +++ b/drivers/staging/media/atomisp/pci/atomisp_subdev.c @@ -1062,26 +1062,6 @@ static const struct v4l2_ctrl_config ctrl_select_isp_version = { .def = 0, }; -#if 0 /* #ifdef CONFIG_ION */ -/* - * Control for ISP ion device fd - * - * userspace will open ion device and pass the fd to kernel. - * this fd will be used to map shared fd to buffer. - */ -/* V4L2_CID_ATOMISP_ION_DEVICE_FD is not defined */ -static const struct v4l2_ctrl_config ctrl_ion_dev_fd = { - .ops = &ctrl_ops, - .id = V4L2_CID_ATOMISP_ION_DEVICE_FD, - .type = V4L2_CTRL_TYPE_INTEGER, - .name = "Ion Device Fd", - .min = -1, - .max = 1024, - .step = 1, - .def = ION_FD_UNSET -}; -#endif - static void atomisp_init_subdev_pipe(struct atomisp_sub_device *asd, struct atomisp_video_pipe *pipe, enum v4l2_buf_type buf_type) { diff --git a/kernel/configs/android-recommended.config b/kernel/configs/android-recommended.config index 53d688bdd894..eb0029c9a6a6 100644 --- a/kernel/configs/android-recommended.config +++ b/kernel/configs/android-recommended.config @@ -81,7 +81,6 @@ CONFIG_INPUT_JOYSTICK=y CONFIG_INPUT_MISC=y CONFIG_INPUT_TABLET=y CONFIG_INPUT_UINPUT=y -CONFIG_ION=y CONFIG_JOYSTICK_XPAD=y CONFIG_JOYSTICK_XPAD_FF=y CONFIG_JOYSTICK_XPAD_LEDS=y -- 2.29.2.729.g45daf8777d-goog