Skip to contentSkip to conversation

drivers: staging: retire drivers/staging/goldfish

PATCH In review [email protected] 2 participants 3 messages Nov 12, 2020 – Nov 13, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drivers: staging: retire drivers/staging/goldfish

From: Roman Kiryanov <[email protected]>

Android Studio Emulator (goldfish) migrated
to Intel HDA.

---
 arch/mips/configs/generic/board-ranchu.config |   1 -
 drivers/staging/Kconfig                       |   2 -
 drivers/staging/Makefile                      |   1 -
 drivers/staging/goldfish/Kconfig              |   7 -
 drivers/staging/goldfish/Makefile             |   6 -
 drivers/staging/goldfish/README               |   5 -
 drivers/staging/goldfish/goldfish_audio.c     | 383 ------------------
 7 files changed, 405 deletions(-)
 delete mode 100644 drivers/staging/goldfish/Kconfig
 delete mode 100644 drivers/staging/goldfish/Makefile
 delete mode 100644 drivers/staging/goldfish/README
 delete mode 100644 drivers/staging/goldfish/goldfish_audio.c
arch/mips/configs/generic/board-ranchu.config +0 -1
index fee9ad4c5598..640aac845ebe 100644
@@ -5,7 +5,6 @@ CONFIG_FB=y
 CONFIG_FB_GOLDFISH=y
 CONFIG_GOLDFISH=y
 CONFIG_STAGING=y
-CONFIG_GOLDFISH_AUDIO=y
 CONFIG_GOLDFISH_PIC=y
 CONFIG_GOLDFISH_PIPE=y
 CONFIG_GOLDFISH_TTY=y
drivers/staging/Kconfig +0 -2
index 2d0310448eba..c4fb7312392a 100644
@@ -68,8 +68,6 @@ source "drivers/staging/gdm724x/Kconfig"
 
 source "drivers/staging/fwserial/Kconfig"
 
-source "drivers/staging/goldfish/Kconfig"
-
 source "drivers/staging/netlogic/Kconfig"
 
 source "drivers/staging/gs_fpgaboot/Kconfig"
drivers/staging/Makefile +0 -1
index 757a892ab5b9..b72c3a04899b 100644
@@ -25,7 +25,6 @@ obj-$(CONFIG_ANDROID)		+= android/
 obj-$(CONFIG_STAGING_BOARD)	+= board/
 obj-$(CONFIG_LTE_GDM724X)	+= gdm724x/
 obj-$(CONFIG_FIREWIRE_SERIAL)	+= fwserial/
-obj-$(CONFIG_GOLDFISH)		+= goldfish/
 obj-$(CONFIG_GS_FPGABOOT)	+= gs_fpgaboot/
 obj-$(CONFIG_UNISYSSPAR)	+= unisys/
 obj-$(CONFIG_COMMON_CLK_XLNX_CLKWZRD)	+= clocking-wizard/
drivers/staging/goldfish/Kconfig deleted +0 -7
deleted file mode 100644
index 728f4700b98d..000000000000
@@ -1,7 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-config GOLDFISH_AUDIO
-	tristate "Goldfish AVD Audio Device"
-	depends on GOLDFISH
-	help
-	  Emulated audio channel for the Goldfish Android Virtual Device
-
drivers/staging/goldfish/Makefile deleted +0 -6
deleted file mode 100644
index f7cee15529c3..000000000000
@@ -1,6 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-#
-# Makefile for the Goldfish audio driver
-#
-
-obj-$(CONFIG_GOLDFISH_AUDIO) += goldfish_audio.o
drivers/staging/goldfish/README deleted +0 -5
deleted file mode 100644
index ed08c4d46e75..000000000000
@@ -1,5 +0,0 @@
-Audio
------
-- Move to using the ALSA framework not faking it
-- Fix the wrong user page DMA (moving to ALSA may fix that too)
-
drivers/staging/goldfish/goldfish_audio.c deleted +0 -383

383 lines not on this page · raw message

Signature · 1 line
2.29.2.222.g5d2a92d10f8-goog
maintainer
#1 lore raw
Quoted 4 lines · On Thu, Nov 12, 2020 at 03:49:07PM -0800, [email protected] wrote:

From: Roman Kiryanov <[email protected]>

Android Studio Emulator (goldfish) migrated
to Intel HDA.

When was that?

Quoted 10 lines
---
 arch/mips/configs/generic/board-ranchu.config |   1 -
 drivers/staging/Kconfig                       |   2 -
 drivers/staging/Makefile                      |   1 -
 drivers/staging/goldfish/Kconfig              |   7 -
 drivers/staging/goldfish/Makefile             |   6 -
 drivers/staging/goldfish/README               |   5 -
 drivers/staging/goldfish/goldfish_audio.c     | 383 ------------------

What about the other goldfish drivers?

thanks,

greg k-h

#2 lore raw

Hi Greg, thank you for looking into this.

Quoted 8 lines · Greg KH
Quoted 4 lines · On Thu, Nov 12, 2020 at 03:49:07PM -0800, [email protected] wrote:

From: Roman Kiryanov <[email protected]>

Android Studio Emulator (goldfish) migrated
to Intel HDA.

When was that?

At least one year, our 4.14 kernel does not include this option into the defconfig, 4.4 includes it, but probably we don't need it.

Quoted 1 line

What about the other goldfish drivers?

There are only four goldfish divers we use in R: goldfish_pipe, goldfish_battery, goldfish_sync and
goldfish_address_space. The goldfish_battery one is fully upstreamed but I need to cleanup
Kconfig's (this is why I sent this patch). The goldfish_pipe one has off-tree changes.
The goldfish_sync and goldfish_address_space are not in the kernel tree at all.

The rest can be retired - I will send patches.

The goldfish_pipe driver will be replaced by virtio-vsock and virtio-console eventually.
We considered retiring goldfish_battery by switching to ACPI_BATTERY but ACPI is not available (at least in GKI) on arm64.

Regards,
Roman.