devres: allow const resource arguments

[mirror_ubuntu-bionic-kernel.git] / include / linux / vga_switcheroo.h

diff --git a/include/linux/vga_switcheroo.h b/include/linux/vga_switcheroo.h
index 960bedbdec87b3e4586f487d57223dccc8b8a4fd..d284f0b16f290f1d85cc1e331adc161df9644dbe 100644 (file)
--- a/include/linux/vga_switcheroo.h
+++ b/include/linux/vga_switcheroo.h
@@ -84,8 +84,8 @@ enum vga_switcheroo_state {
  * Client identifier. Audio clients use the same identifier & 0x100.
  */
 enum vga_switcheroo_client_id {
-       VGA_SWITCHEROO_UNKNOWN_ID = -1,
-       VGA_SWITCHEROO_IGD,
+       VGA_SWITCHEROO_UNKNOWN_ID = 0x1000,
+       VGA_SWITCHEROO_IGD = 0,
        VGA_SWITCHEROO_DIS,
        VGA_SWITCHEROO_MAX_CLIENTS,
 };
@@ -151,7 +151,7 @@ int vga_switcheroo_register_client(struct pci_dev *dev,
                                   bool driver_power_control);
 int vga_switcheroo_register_audio_client(struct pci_dev *pdev,
                                         const struct vga_switcheroo_client_ops *ops,
-                                        enum vga_switcheroo_client_id id);
+                                        struct pci_dev *vga_dev);
 
 void vga_switcheroo_client_fb_set(struct pci_dev *dev,
                                  struct fb_info *info);
@@ -183,7 +183,7 @@ static inline int vga_switcheroo_register_handler(const struct vga_switcheroo_ha
                enum vga_switcheroo_handler_flags_t handler_flags) { return 0; }
 static inline int vga_switcheroo_register_audio_client(struct pci_dev *pdev,
        const struct vga_switcheroo_client_ops *ops,
-       enum vga_switcheroo_client_id id) { return 0; }
+       struct pci_dev *vga_dev) { return 0; }
 static inline void vga_switcheroo_unregister_handler(void) {}
 static inline enum vga_switcheroo_handler_flags_t vga_switcheroo_handler_flags(void) { return 0; }
 static inline int vga_switcheroo_lock_ddc(struct pci_dev *pdev) { return -ENODEV; }