Merge tag 'iio-fixes-for-4.4a' of ssh://ra.kernel.org/pub/scm/linux/kernel/git/jic23...

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / vga / vga_switcheroo.c

diff --git a/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c
index af0d372ff7d43d1e90bc9ec4a35a823a5f68acf0..41edd5a3f10097e8c030b076397fec389448319d 100644 (file)
--- a/drivers/gpu/vga/vga_switcheroo.c
+++ b/drivers/gpu/vga/vga_switcheroo.c
@@ -140,7 +140,7 @@ struct vgasr_priv {
        int registered_clients;
        struct list_head clients;
 
-       struct vga_switcheroo_handler *handler;
+       const struct vga_switcheroo_handler *handler;
 };
 
 #define ID_BIT_AUDIO           0x100
@@ -195,7 +195,7 @@ static void vga_switcheroo_enable(void)
  *
  * Return: 0 on success, -EINVAL if a handler was already registered.
  */
-int vga_switcheroo_register_handler(struct vga_switcheroo_handler *handler)
+int vga_switcheroo_register_handler(const struct vga_switcheroo_handler *handler)
 {
        mutex_lock(&vgasr_mutex);
        if (vgasr_priv.handler) {
@@ -356,8 +356,6 @@ enum vga_switcheroo_state vga_switcheroo_get_client_state(struct pci_dev *pdev)
        client = find_client_from_pci(&vgasr_priv.clients, pdev);
        if (!client)
                ret = VGA_SWITCHEROO_NOT_FOUND;
-       else if (!vgasr_priv.active)
-               ret = VGA_SWITCHEROO_INIT;
        else
                ret = client->pwr_state;
        mutex_unlock(&vgasr_mutex);