[PATCH] media: sta2x11: remove VIRT_TO_BUS dependency

[PATCH] media: sta2x11: remove VIRT_TO_BUS dependency

[Arnd Bergmann]

From: Arnd Bergmann <arnd@arndb.de>

This driver does not use the virt_to_bus() function, though it
depends on x86 specific fixups in the swiotlb code, which was
last rewritten in commit e380a0394c36 ("x86/PCI: sta2x11: use
default DMA address translation").

It is possible that the driver still fails to build on some
architectures that are missing CONFIG_VIRT_TO_BUS, but it is
always set on x86 machines with the STA2X11 platform enabled.

More likely though is that it was never meant to depend on
CONFIG_VIRT_TO_BUS, and the Kconfig dependency was kept from
an out-of-tree version when the driver was originally merged.

Fixes: efeb98b4e2b2 ("[media] STA2X11 VIP: new V4L2 driver")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/media/pci/sta2x11/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/media/pci/sta2x11/Kconfig b/drivers/media/pci/sta2x11/Kconfig
index a96e170ab04e..118b922c08c3 100644
--- a/drivers/media/pci/sta2x11/Kconfig
+++ b/drivers/media/pci/sta2x11/Kconfig
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-only
 config STA2X11_VIP
 	tristate "STA2X11 VIP Video For Linux"
-	depends on PCI && VIDEO_DEV && VIRT_TO_BUS && I2C
+	depends on PCI && VIDEO_DEV && I2C
 	depends on STA2X11 || COMPILE_TEST
 	select GPIOLIB if MEDIA_SUBDRV_AUTOSELECT
 	select VIDEO_ADV7180 if MEDIA_SUBDRV_AUTOSELECT
-- 
2.29.2

Re: [PATCH] media: sta2x11: remove VIRT_TO_BUS dependency

[Arnd Bergmann]

On Thu, Jun 16, 2022 at 10:52 AM Arnd Bergmann <arnd@kernel.org> wrote:
>
> diff --git a/drivers/media/pci/sta2x11/Kconfig b/drivers/media/pci/sta2x11/Kconfig
> index a96e170ab04e..118b922c08c3 100644
> --- a/drivers/media/pci/sta2x11/Kconfig
> +++ b/drivers/media/pci/sta2x11/Kconfig
> @@ -1,7 +1,7 @@
>  # SPDX-License-Identifier: GPL-2.0-only
>  config STA2X11_VIP
>         tristate "STA2X11 VIP Video For Linux"
> -       depends on PCI && VIDEO_DEV && VIRT_TO_BUS && I2C
> +       depends on PCI && VIDEO_DEV && I2C
>         depends on STA2X11 || COMPILE_TEST

As I resent this one out of series, I guess I should clarify: I would
like to merge the patch to remove VIRT_TO_BUS through the
asm-generic tree for 5.20, which would make STA2X11_VIP
impossible to select, unless this patch gets applied as well.

I can take the patch through the asm-generic tree as well if anyone
cares about bisectibility here.

         Arnd

Re: [PATCH] media: sta2x11: remove VIRT_TO_BUS dependency

[Hans Verkuil]

On 16/06/2022 11:32, Arnd Bergmann wrote:
> On Thu, Jun 16, 2022 at 10:52 AM Arnd Bergmann <arnd@kernel.org> wrote:
>>
>> diff --git a/drivers/media/pci/sta2x11/Kconfig b/drivers/media/pci/sta2x11/Kconfig
>> index a96e170ab04e..118b922c08c3 100644
>> --- a/drivers/media/pci/sta2x11/Kconfig
>> +++ b/drivers/media/pci/sta2x11/Kconfig
>> @@ -1,7 +1,7 @@
>>  # SPDX-License-Identifier: GPL-2.0-only
>>  config STA2X11_VIP
>>         tristate "STA2X11 VIP Video For Linux"
>> -       depends on PCI && VIDEO_DEV && VIRT_TO_BUS && I2C
>> +       depends on PCI && VIDEO_DEV && I2C
>>         depends on STA2X11 || COMPILE_TEST
> 
> As I resent this one out of series, I guess I should clarify: I would
> like to merge the patch to remove VIRT_TO_BUS through the
> asm-generic tree for 5.20, which would make STA2X11_VIP
> impossible to select, unless this patch gets applied as well.
> 
> I can take the patch through the asm-generic tree as well if anyone
> cares about bisectibility here.
> 
>          Arnd

I'll take this patch through the media subsystem for 5.20.

Regards,

	Hans