On Fri, 28 Aug 2015, Lukas Wunner <lukas at wunner.de> wrote:
> Signed-off-by: Lukas Wunner <lukas at wunner.de>
Reviewed-by: Jani Nikula <jani.nikula at intel.com>
> ---
> drivers/gpu/vga/vga_switcheroo.c | 6 +++---
> include/linux/vga_switcheroo.h | 4 ++--
> 2 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/vga/vga_switcheroo.c
> b/drivers/gpu/vga/vga_switcheroo.c
> index 845e47d..7b53246 100644
> --- a/drivers/gpu/vga/vga_switcheroo.c
> +++ b/drivers/gpu/vga/vga_switcheroo.c
> @@ -102,7 +102,7 @@
> struct vga_switcheroo_client {
> struct pci_dev *pdev;
> struct fb_info *fb_info;
> - int pwr_state;
> + enum vga_switcheroo_state pwr_state;
> const struct vga_switcheroo_client_ops *ops;
> int id;
> bool active;
> @@ -346,7 +346,7 @@ find_active_client(struct list_head *head)
> *
> * Return: Power state.
> */
> -int vga_switcheroo_get_client_state(struct pci_dev *pdev)
> +enum vga_switcheroo_state vga_switcheroo_get_client_state(struct pci_dev
> *pdev)
> {
> struct vga_switcheroo_client *client;
> enum vga_switcheroo_state ret;
> @@ -496,7 +496,7 @@ static int vga_switchoff(struct vga_switcheroo_client
> *client)
> return 0;
> }
>
> -static void set_audio_state(int id, int state)
> +static void set_audio_state(int id, enum vga_switcheroo_state state)
> {
> struct vga_switcheroo_client *client;
>
> diff --git a/include/linux/vga_switcheroo.h b/include/linux/vga_switcheroo.h
> index 95bfbeb0..219876e 100644
> --- a/include/linux/vga_switcheroo.h
> +++ b/include/linux/vga_switcheroo.h
> @@ -133,7 +133,7 @@ void vga_switcheroo_unregister_handler(void);
>
> int vga_switcheroo_process_delayed_switch(void);
>
> -int vga_switcheroo_get_client_state(struct pci_dev *dev);
> +enum vga_switcheroo_state vga_switcheroo_get_client_state(struct pci_dev
> *dev);
>
> void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum
> vga_switcheroo_state dynamic);
>
> @@ -152,7 +152,7 @@ static inline int
> vga_switcheroo_register_audio_client(struct pci_dev *pdev,
> int id) { return 0; }
> static inline void vga_switcheroo_unregister_handler(void) {}
> static inline int vga_switcheroo_process_delayed_switch(void) { return 0; }
> -static inline int vga_switcheroo_get_client_state(struct pci_dev *dev) {
> return VGA_SWITCHEROO_ON; }
> +static inline enum vga_switcheroo_state
> 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 at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Jani Nikula, Intel Open Source Technology Center
