From nobody Thu May 14 07:06:26 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DBACAC433F5 for ; Mon, 18 Apr 2022 23:30:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235170AbiDRXdR (ORCPT ); Mon, 18 Apr 2022 19:33:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48510 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235040AbiDRXdQ (ORCPT ); Mon, 18 Apr 2022 19:33:16 -0400 Received: from m228-13.mailgun.net (m228-13.mailgun.net [159.135.228.13]) by lindbergh.monkeyblade.net (Postfix) with UTF8SMTPS id 14D57AE43 for ; Mon, 18 Apr 2022 16:30:35 -0700 (PDT) DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=codeagain.dev; q=dns/txt; s=smtp; t=1650324635; h=In-Reply-To: Content-Type: MIME-Version: References: Message-ID: Subject: Subject: To: To: From: From: Date: Sender: Sender; bh=EwsT33pUVnuEsrNDQMK2HIpchqoo7809zU3be87TZK4=; b=YRLaADjCsI5wOXhdDO+Ryo/0C2vIE9GrhQkgWGRvbr2luHoLAZEyEM193rJWgevIhT8D8fzW CbxBL5VzzuQxsKa5GPRAHqnxobG2OC+y1Ezu/bSN9RiUnii1vv2b57SV2FsTFtPwWPQK6/06 0UsprcrIl2EWz+T3kgOOh0ZjgwYvwutgkQ79BrSId8HXu+9ISbE4iz28YBWXSSprJE+8BIxk fSlU3797Hxxu721B5SlCGxP1dk7QPbY4BezQs3mca3TgnKkTlYp+mLjOFo21uN3FpDmxdtAa cwmhtLi0JqCiVhXKSZnNwOdb+XESEwPYXhRGonoPCOib5SxdGv1uaw== X-Mailgun-Sending-Ip: 159.135.228.13 X-Mailgun-Sid: WyJkNDU4NiIsICJsaW51eC1rZXJuZWxAdmdlci5rZXJuZWwub3JnIiwgImJlOWM2ZCJd Received: from AN5Bruno (186-250-90-1.mhnet.com.br [186.250.90.1]) by smtp-out-n04.prod.us-west-2.postgun.com with SMTP id 625df49877e17d301dfc5d9e (version=TLS1.3, cipher=TLS_AES_128_GCM_SHA256); Mon, 18 Apr 2022 23:30:32 GMT Sender: codeagain@codeagain.dev Date: Mon, 18 Apr 2022 20:30:26 -0300 From: Bruno Moreira-Guedes To: Greg Kroah-Hartman , Martyn Welch , Manohar Vanga , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, outreachy@lists.linux.dev, Bruno's Patch Watchbox Subject: [PATCH v3 1/3] staging: vme: Move vme_user to staging KConfig Message-ID: References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="ko7y2xunhwulay2h" Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --ko7y2xunhwulay2h Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Currently, the VME_USER driver is in the staging tree Kconfig, unlike other VME drivers already moved to the main portions of the kernel tree. Its configuration is, however, nested into the VME_BUS config option, which might be misleading. Since the staging tree "[...] is used to hold stand-alone drivers and filesystem that are not ready to be merged into the main portion of the Linux kernel tree [...]"(from=20 https://lore.kernel.org/all/20090320172502.GA14647@kroah.com/T/), staging drivers should appear nested into the Main Menu -> Device Drivers -> Staging Drivers to make sure the user don't pick it without being fully aware of its staging status as it could be the case in Menu -> Device Drivers -> VME bridge support (the current location). With this change menuconfig users will clearly know this is not a driver in the main portion of the kernel tree and decide whether to build it or not with that clearly in mind. This change goes into the same direction of commit <4b4cdf3979c32fa3d042d150f49449c74d048553> ("STAGING: Move staging drivers back to staging-specific menu") Signed-off-by: Bruno Moreira-Guedes --- drivers/staging/Kconfig | 2 ++ drivers/vme/Kconfig | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index fc274737053d..e4dcf411030d 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -87,4 +87,6 @@ source "drivers/staging/fieldbus/Kconfig" source "drivers/staging/qlge/Kconfig" =20 =20 +source "drivers/staging/vme/devices/Kconfig" + endif # STAGING diff --git a/drivers/vme/Kconfig b/drivers/vme/Kconfig index 936392ca3c8c..c13dd9d2a604 100644 --- a/drivers/vme/Kconfig +++ b/drivers/vme/Kconfig @@ -15,6 +15,4 @@ source "drivers/vme/bridges/Kconfig" =20 source "drivers/vme/boards/Kconfig" =20 -source "drivers/staging/vme/devices/Kconfig" - endif # VME --=20 2.35.3 =20 --ko7y2xunhwulay2h Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEABYIAB0WIQQTUrsHCxGmQ5vyKRAZtd3tyEY2kgUCYl30kgAKCRAZtd3tyEY2 kqpYAQDVAKKyckdRSKCGBHnP8fVN6mP2Gj0q7nrpyryF38y3fgD+O5vZedtKgOcQ fzsS2B0wlSgeSjCE5aEAkVsWqKAaKg4= =i9W+ -----END PGP SIGNATURE----- --ko7y2xunhwulay2h-- From nobody Thu May 14 07:06:26 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B8E86C433F5 for ; Mon, 18 Apr 2022 23:36:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235468AbiDRXir (ORCPT ); Mon, 18 Apr 2022 19:38:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53156 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234905AbiDRXip (ORCPT ); Mon, 18 Apr 2022 19:38:45 -0400 Received: from m228-13.mailgun.net (m228-13.mailgun.net [159.135.228.13]) by lindbergh.monkeyblade.net (Postfix) with UTF8SMTPS id 81FFA2125E for ; Mon, 18 Apr 2022 16:36:05 -0700 (PDT) DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=codeagain.dev; q=dns/txt; s=smtp; t=1650324965; h=In-Reply-To: Content-Type: MIME-Version: References: Message-ID: Subject: Subject: To: To: From: From: Date: Sender: Sender; bh=kMG8sFH31a0X0raOtVjkeRqHkhxX2+EF44xf1squ1AU=; b=sA4KVZ0YoKQyosjQFQl8Xm1D4EmakoM+J+f9/ATZmjTdAbYpA2KMrxjJy+t6Q36OeDfzu2mU l9LDANP2mKrhAV+d0+zonDEeUXOchG8xp+2CnyLwzqg0ZuWEd72lvglgBIWrSItw1P2vPS2a JvH06R0/8ZClEY/i5o2dWzGkMrLr3F6h88Q0sJHtLT8I+fRv/DxLw5hS02g9wpDURQqjUBbm 8kkp6b7cneJ6dFmox0/5zaoq/O+0XSouEcwhK2aYD0Sdq1i5EGeW0YI5fvIvZCAd2opxOXMG 7hwfTLJHqjdBLS92UyJQP4Z6nQZBt3AqZMVxEOF2SCgWCoYsQa0A4A== X-Mailgun-Sending-Ip: 159.135.228.13 X-Mailgun-Sid: WyJkNDU4NiIsICJsaW51eC1rZXJuZWxAdmdlci5rZXJuZWwub3JnIiwgImJlOWM2ZCJd Received: from AN5Bruno (186-250-90-1.mhnet.com.br [186.250.90.1]) by smtp-out-n02.prod.us-west-2.postgun.com with SMTP id 625df5e3487c9ee854f9ac25 (version=TLS1.3, cipher=TLS_AES_128_GCM_SHA256); Mon, 18 Apr 2022 23:36:03 GMT Sender: codeagain@codeagain.dev Date: Mon, 18 Apr 2022 20:35:58 -0300 From: Bruno Moreira-Guedes To: Greg Kroah-Hartman , Martyn Welch , Manohar Vanga , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, outreachy@lists.linux.dev, Bruno's Patch Watchbox Subject: [PATCH v3 2/3] staging: vme: Add VME_BUS dependency to Kconfig Message-ID: <00de5644d7c2f8c8878eccf86b761e0602732089.1650321310.git.codeagain@codeagain.dev> References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="yrwrexl5pnrjq3vj" Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --yrwrexl5pnrjq3vj Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The KConfig file for VME_USER ('drivers/staging/vme/devices/Kconfig') sourced at "drivers/vme/boards/KConfig" misses a `depends on` line for VME_BUS, which is unnoticeable for menuconfig users who aren't be able to select it through this interface without setting the CONFIG_VME_BUS option because it's nested on VME_BUS menu entry. A patch to move appropriately this driver to the "Staging" submenu ([PATCH 1/3], originally sent as a single patch submitted at https://lore.kernel.org/linux-staging/3fbc5325e94b9ae0666a1f5a56a4e5372bfce= a1d.camel@codeagain.dev/T/#t), however, unveiled this missing `depends on` line, since it moved the `source` line for VME_USER's KConfig to somewhere else, allowing it to be compiled without the support for VME_BUS. While it compiles fine and seems to initialize the driver fine (tested both as module and as built- in), it seems to make no sense having VME_USER without VME_BUS. This patches addresses it by adding the VME_BUS to the `depends on` line at "drivers/staging/vme/devices/Kconfig". Signed-off-by: Bruno Moreira-Guedes --- drivers/staging/vme/devices/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/vme/devices/Kconfig b/drivers/staging/vme/devi= ces/Kconfig index 5651bb16b28b..e8b4461bf27f 100644 --- a/drivers/staging/vme/devices/Kconfig +++ b/drivers/staging/vme/devices/Kconfig @@ -3,7 +3,7 @@ comment "VME Device Drivers" =20 config VME_USER tristate "VME user space access driver" - depends on STAGING + depends on STAGING && VME_BUS help If you say Y here you want to be able to access a limited number of VME windows in a manner at least semi-compatible with the interface --=20 2.35.3 --yrwrexl5pnrjq3vj Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEABYIAB0WIQQTUrsHCxGmQ5vyKRAZtd3tyEY2kgUCYl313gAKCRAZtd3tyEY2 kjTxAQC4E3fMmO6NuNr+ZjnKdvVLMMu7bxef7GU+Z24BXR39JAD+OaIcogcphT/P jxrp/1urNRHFV0DPz3faSKbQlehAZQY= =e2hd -----END PGP SIGNATURE----- --yrwrexl5pnrjq3vj-- From nobody Thu May 14 07:06:26 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C489EC433F5 for ; Mon, 18 Apr 2022 23:31:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235223AbiDRXd4 (ORCPT ); Mon, 18 Apr 2022 19:33:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48864 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235040AbiDRXdy (ORCPT ); Mon, 18 Apr 2022 19:33:54 -0400 Received: from m228-13.mailgun.net (m228-13.mailgun.net [159.135.228.13]) by lindbergh.monkeyblade.net (Postfix) with UTF8SMTPS id B9581245A4 for ; Mon, 18 Apr 2022 16:31:14 -0700 (PDT) DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=codeagain.dev; q=dns/txt; s=smtp; t=1650324674; h=In-Reply-To: Content-Type: MIME-Version: References: Message-ID: Subject: Subject: To: To: From: From: Date: Sender: Sender; bh=cUyk4WeVp+7lDDXFiewp5XkVKA3vNjvg2iTdrwTV7jk=; b=fEWiSC9CHlf1UW46B5+FABN2njRABPakwMTMofI2x+pImOHS4Y9Q31YVoDfzaDSRsxO2Lq2h 0JePL4xYRgr4DLt32S1IyVhp9TSGhIkhMQ8VywgqVpmSj3nks87qimGSBqWu9Q+aQ8VoszEd /uh5uFfXqkMuxGQkF85ynIJZv+jB9Io0KZACsC4ldkX1jolyL5VctLaBgWN93/OJUKaue/DU kKTIJ+Qkbg2+kecwrd/pcls1iIoff9z29HO6QTffoEKS0PdVR1xpx/ruEC8qZoREcSz7VJSb GAE5K0QPCgG0jlZIulFrCG5XkXaDyPnNwVH2HlaFHlDYXdPcf07SVQ== X-Mailgun-Sending-Ip: 159.135.228.13 X-Mailgun-Sid: WyJkNDU4NiIsICJsaW51eC1rZXJuZWxAdmdlci5rZXJuZWwub3JnIiwgImJlOWM2ZCJd Received: from AN5Bruno (186-250-90-1.mhnet.com.br [186.250.90.1]) by smtp-out-n02.prod.us-east-1.postgun.com with SMTP id 625df4c157b6987692272704 (version=TLS1.3, cipher=TLS_AES_128_GCM_SHA256); Mon, 18 Apr 2022 23:31:13 GMT Sender: codeagain@codeagain.dev Date: Mon, 18 Apr 2022 20:31:09 -0300 From: Bruno Moreira-Guedes To: Greg Kroah-Hartman , Martyn Welch , Manohar Vanga , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, outreachy@lists.linux.dev, Bruno's Patch Watchbox Subject: [PATCH v2 2/3] staging: vme: Add VME_BUS dependency to Kconfig Message-ID: <00de5644d7c2f8c8878eccf86b761e0602732080.1650321310.git.codeagain@codeagain.dev> References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="puumcnxop7gnfgad" Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --puumcnxop7gnfgad Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The KConfig file for VME_USER ('drivers/staging/vme/devices/Kconfig') sourced at "drivers/vme/boards/KConfig" misses a `depends on` line for VME_BUS, which is unnoticeable for menuconfig users who aren't be able to select it through this interface without setting the CONFIG_VME_BUS option because it's nested on VME_BUS menu entry. A patch to move appropriately this driver to the "Staging" submenu ([PATCH 1/3], originally sent as a single patch submitted at https://lore.kernel.org/linux-staging/3fbc5325e94b9ae0666a1f5a56a4e5372bfce= a1d.camel@codeagain.dev/T/#t), however, unveiled this missing `depends on` line, since it moved the `source` line for VME_USER's KConfig to somewhere else, allowing it to be compiled without the support for VME_BUS. While it compiles fine and seems to initialize the driver fine (tested both as module and as built- in), it seems to make no sense having VME_USER without VME_BUS. This patches addresses it by adding the VME_BUS to the `depends on` line at "drivers/staging/vme/devices/Kconfig". Signed-off-by: Bruno Moreira-Guedes --- drivers/staging/vme/devices/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/vme/devices/Kconfig b/drivers/staging/vme/devi= ces/Kconfig index 5651bb16b28b..e8b4461bf27f 100644 --- a/drivers/staging/vme/devices/Kconfig +++ b/drivers/staging/vme/devices/Kconfig @@ -3,7 +3,7 @@ comment "VME Device Drivers" =20 config VME_USER tristate "VME user space access driver" - depends on STAGING + depends on STAGING && VME_BUS help If you say Y here you want to be able to access a limited number of VME windows in a manner at least semi-compatible with the interface --=20 2.35.3 --puumcnxop7gnfgad Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEABYIAB0WIQQTUrsHCxGmQ5vyKRAZtd3tyEY2kgUCYl30vQAKCRAZtd3tyEY2 kohYAQDEeD7sf3Z3MEfQ4IbsXM+kMkMKZFFU7UTHectNWRtjGgEAleJ6U7vvTNA8 TbWm4PGZ6Auk3ajk62MwvZUGnEJOuwM= =DWuN -----END PGP SIGNATURE----- --puumcnxop7gnfgad-- From nobody Thu May 14 07:06:26 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1A5F9C433F5 for ; Mon, 18 Apr 2022 23:31:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235282AbiDRXee (ORCPT ); Mon, 18 Apr 2022 19:34:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49254 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235229AbiDRXec (ORCPT ); Mon, 18 Apr 2022 19:34:32 -0400 Received: from m228-13.mailgun.net (m228-13.mailgun.net [159.135.228.13]) by lindbergh.monkeyblade.net (Postfix) with UTF8SMTPS id 0625227B23 for ; Mon, 18 Apr 2022 16:31:51 -0700 (PDT) DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=codeagain.dev; q=dns/txt; s=smtp; t=1650324711; h=In-Reply-To: Content-Type: MIME-Version: References: Message-ID: Subject: Subject: To: To: From: From: Date: Sender: Sender; bh=8x4EIBktaep8KLV7xYfWOqCNjJ4iQEpx8+XIrD81NpQ=; b=YBCN5D3HmbgRvc5AbLPrsXAzpGla8Td2BrqiNgak04uFU1NS6tn1CVMQjbfaKKioMyfuMYSE hfEBeaOJ1CFGq8NOatYOjlBuhKWMjlIbvLhquAXOZ0iDGnUg+p06dwDXcuw4yGmdcp/e0uVD VevtDQwrUpxEA4pOK7zmCfkvhomyqS+eOIebLJ43ck314icJXQWp2zIwk/HZFskyaUM5g69Q Smt0cIojmPeWyXHI1ff1aIdcBuZ9P6Axv/jEIX/rKH6Y5wvshO7qacKc8iAWy/Muq/8GYi6Z y58KqFgJ99WCewpvBjKdzVAB/weHFoeOB//ffyiqyz1Jnur1eR8meA== X-Mailgun-Sending-Ip: 159.135.228.13 X-Mailgun-Sid: WyJkNDU4NiIsICJsaW51eC1rZXJuZWxAdmdlci5rZXJuZWwub3JnIiwgImJlOWM2ZCJd Received: from AN5Bruno (186-250-90-1.mhnet.com.br [186.250.90.1]) by smtp-out-n03.prod.us-east-1.postgun.com with SMTP id 625df4e7514839a819a976e3 (version=TLS1.3, cipher=TLS_AES_128_GCM_SHA256); Mon, 18 Apr 2022 23:31:51 GMT Sender: codeagain@codeagain.dev Date: Mon, 18 Apr 2022 20:31:47 -0300 From: Bruno Moreira-Guedes To: Greg Kroah-Hartman , Martyn Welch , Manohar Vanga , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, outreachy@lists.linux.dev, Bruno's Patch Watchbox Subject: [PATCH v3 3/3] staging: vme: Move 'vme/devices' to 'vme_user/' Message-ID: <2cd7de9a426c443a5ea618682d605ecfd751d798.1650321310.git.codeagain@codeagain.dev> References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="h7wzwr7dd4vsi3qs" Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --h7wzwr7dd4vsi3qs Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" In ("Staging: VME: move VME=20 drivers out of staging") the vme code, board and bridge drivers were moved out of the staging tree, remaining only the VME user device=20 driver. Since this driver is the only one remaining in staging, such multi-level structure confuses more than helps. The current structure is as follows: - drivers/staging/vme/ Makefile devices/ Kconfig Makefile vme_user.c vme_user.h The top-level Makefile has the only function of calling another Makefile into the devices/ subdirectory. This latter only compiles the vme_user=20 driver, since there is no other in the staging tree. This patch removes the unnecessary Makefile from the 'vme/' dir, move the contents of 'vme/devices' into the 'vme/' dir, and renames it to 'vme_user/' (the driver name), allowing a straightforward understanding of this driver's contents. Furthermore, it updates the MAINTAINERS file to properly reflect the new paths. Signed-off-by: Bruno Moreira-Guedes --- MAINTAINERS | 2 +- drivers/staging/Kconfig | 3 +-- drivers/staging/Makefile | 2 +- drivers/staging/vme/Makefile | 2 -- drivers/staging/{vme/devices =3D> vme_user}/Kconfig | 0 drivers/staging/{vme/devices =3D> vme_user}/Makefile | 0 drivers/staging/{vme/devices =3D> vme_user}/vme_user.c | 0 drivers/staging/{vme/devices =3D> vme_user}/vme_user.h | 0 8 files changed, 3 insertions(+), 6 deletions(-) delete mode 100644 drivers/staging/vme/Makefile rename drivers/staging/{vme/devices =3D> vme_user}/Kconfig (100%) rename drivers/staging/{vme/devices =3D> vme_user}/Makefile (100%) rename drivers/staging/{vme/devices =3D> vme_user}/vme_user.c (100%) rename drivers/staging/{vme/devices =3D> vme_user}/vme_user.h (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 3ed62dcd144e..efc38961f792 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -21010,7 +21010,7 @@ L: linux-kernel@vger.kernel.org S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git F: Documentation/driver-api/vme.rst -F: drivers/staging/vme/ +F: drivers/staging/vme_user/ F: drivers/vme/ F: include/linux/vme* =20 diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index e4dcf411030d..e117811ec832 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -86,7 +86,6 @@ source "drivers/staging/fieldbus/Kconfig" =20 source "drivers/staging/qlge/Kconfig" =20 - -source "drivers/staging/vme/devices/Kconfig" +source "drivers/staging/vme_user/Kconfig" =20 endif # STAGING diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index 65e317922e3f..db7287de0faf 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -14,7 +14,7 @@ obj-$(CONFIG_OCTEON_ETHERNET) +=3D octeon/ obj-$(CONFIG_OCTEON_USB) +=3D octeon-usb/ obj-$(CONFIG_VT6655) +=3D vt6655/ obj-$(CONFIG_VT6656) +=3D vt6656/ -obj-$(CONFIG_VME_BUS) +=3D vme/ +obj-$(CONFIG_VME_BUS) +=3D vme_user/ obj-$(CONFIG_IIO) +=3D iio/ obj-$(CONFIG_FB_SM750) +=3D sm750fb/ obj-$(CONFIG_USB_EMXX) +=3D emxx_udc/ diff --git a/drivers/staging/vme/Makefile b/drivers/staging/vme/Makefile deleted file mode 100644 index cf2f686ccffe..000000000000 --- a/drivers/staging/vme/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -obj-y +=3D devices/ diff --git a/drivers/staging/vme/devices/Kconfig b/drivers/staging/vme_user= /Kconfig similarity index 100% rename from drivers/staging/vme/devices/Kconfig rename to drivers/staging/vme_user/Kconfig diff --git a/drivers/staging/vme/devices/Makefile b/drivers/staging/vme_use= r/Makefile similarity index 100% rename from drivers/staging/vme/devices/Makefile rename to drivers/staging/vme_user/Makefile diff --git a/drivers/staging/vme/devices/vme_user.c b/drivers/staging/vme_u= ser/vme_user.c similarity index 100% rename from drivers/staging/vme/devices/vme_user.c rename to drivers/staging/vme_user/vme_user.c diff --git a/drivers/staging/vme/devices/vme_user.h b/drivers/staging/vme_u= ser/vme_user.h similarity index 100% rename from drivers/staging/vme/devices/vme_user.h rename to drivers/staging/vme_user/vme_user.h --=20 2.35.3 =20 --h7wzwr7dd4vsi3qs Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEABYIAB0WIQQTUrsHCxGmQ5vyKRAZtd3tyEY2kgUCYl304wAKCRAZtd3tyEY2 kgNmAPwLh3EkpG84T97NtaG8gqOBkJU+EGzJaOKh5x6SkgcIJwEA47aCj+qjQsoj MXoDbCPMt9F5PzXqj+auLgSaUGZgRQg= =76Yv -----END PGP SIGNATURE----- --h7wzwr7dd4vsi3qs--