This reverts commit 26814ce68904c9faf977c90edac798156311981f.
The helper function is no longer needed after Dave Airlie's rewrite
of vga_switcheroo_switch_ddc(), the commit introducing it was only
included because commit 31f23c3d488e43d61e5e812a1830a9ea5589df1d
(drm/edid: Switch DDC when reading the EDID) does not compile
without it.
Signed-off-by: Lukas Wunner <lukas@xxxxxxxxx>
---
drivers/gpu/vga/vga_switcheroo.c | 14 --------------
include/linux/vga_switcheroo.h | 2 --
2 files changed, 16 deletions(-)
diff --git a/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c
index 2534d84..062fafe 100644
--- a/drivers/gpu/vga/vga_switcheroo.c
+++ b/drivers/gpu/vga/vga_switcheroo.c
@@ -214,20 +214,6 @@ find_active_client(struct list_head *head)
return NULL;
}
-struct pci_dev *vga_switcheroo_get_active_client(void)
-{
- struct vga_switcheroo_client *client;
- struct pci_dev *pdev = NULL;
-
- mutex_lock(&vgasr_mutex);
- client = find_active_client(&vgasr_priv.clients);
- if (client)
- pdev = client->pdev;
- mutex_unlock(&vgasr_mutex);
- return pdev;
-}
-EXPORT_SYMBOL(vga_switcheroo_get_active_client);
-
int vga_switcheroo_get_client_state(struct pci_dev *pdev)
{
struct vga_switcheroo_client *client;
diff --git a/include/linux/vga_switcheroo.h b/include/linux/vga_switcheroo.h
index 8963799..60c9d65 100644
--- a/include/linux/vga_switcheroo.h
+++ b/include/linux/vga_switcheroo.h
@@ -63,7 +63,6 @@ void vga_switcheroo_unregister_handler(void);
int vga_switcheroo_process_delayed_switch(void);
-struct pci_dev *vga_switcheroo_get_active_client(void);
int vga_switcheroo_get_client_state(struct pci_dev *dev);
void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic);
@@ -85,7 +84,6 @@ static inline int vga_switcheroo_register_audio_client(struct pci_dev *pdev,
int id, bool active) { return 0; }
static inline void vga_switcheroo_unregister_handler(void) {}
static inline int vga_switcheroo_process_delayed_switch(void) { return 0; }
-static inline struct pci_dev *vga_switcheroo_get_active_client(void) { return NULL; }
static inline int vga_switcheroo_get_client_state(struct pci_dev *dev) { return VGA_SWITCHEROO_ON; }
static inline void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic) {}
--
1.8.5.2 (Apple Git-48)
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/dri-devel
