diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpu/vga/vgaarb.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/gpu/vga/vgaarb.c b/drivers/gpu/vga/vgaarb.c index 199138f241e0..1ac0c93603c9 100644 --- a/drivers/gpu/vga/vgaarb.c +++ b/drivers/gpu/vga/vgaarb.c | |||
@@ -609,7 +609,6 @@ void vga_set_legacy_decoding(struct pci_dev *pdev, unsigned int decodes) | |||
609 | } | 609 | } |
610 | EXPORT_SYMBOL(vga_set_legacy_decoding); | 610 | EXPORT_SYMBOL(vga_set_legacy_decoding); |
611 | 611 | ||
612 | /* return number of active VGA devices */ | ||
613 | /* call with NULL to unregister */ | 612 | /* call with NULL to unregister */ |
614 | int vga_client_register(struct pci_dev *pdev, void *cookie, | 613 | int vga_client_register(struct pci_dev *pdev, void *cookie, |
615 | void (*irq_set_state)(void *cookie, bool state), | 614 | void (*irq_set_state)(void *cookie, bool state), |
@@ -831,7 +830,7 @@ static ssize_t vga_arb_write(struct file *file, const char __user * buf, | |||
831 | curr_pos += 5; | 830 | curr_pos += 5; |
832 | remaining -= 5; | 831 | remaining -= 5; |
833 | 832 | ||
834 | pr_devel("client 0x%X called 'lock'\n", (int)priv); | 833 | pr_devel("client 0x%p called 'lock'\n", priv); |
835 | 834 | ||
836 | if (!vga_str_to_iostate(curr_pos, remaining, &io_state)) { | 835 | if (!vga_str_to_iostate(curr_pos, remaining, &io_state)) { |
837 | ret_val = -EPROTO; | 836 | ret_val = -EPROTO; |
@@ -867,7 +866,7 @@ static ssize_t vga_arb_write(struct file *file, const char __user * buf, | |||
867 | curr_pos += 7; | 866 | curr_pos += 7; |
868 | remaining -= 7; | 867 | remaining -= 7; |
869 | 868 | ||
870 | pr_devel("client 0x%X called 'unlock'\n", (int)priv); | 869 | pr_devel("client 0x%p called 'unlock'\n", priv); |
871 | 870 | ||
872 | if (strncmp(curr_pos, "all", 3) == 0) | 871 | if (strncmp(curr_pos, "all", 3) == 0) |
873 | io_state = VGA_RSRC_LEGACY_IO | VGA_RSRC_LEGACY_MEM; | 872 | io_state = VGA_RSRC_LEGACY_IO | VGA_RSRC_LEGACY_MEM; |
@@ -917,7 +916,7 @@ static ssize_t vga_arb_write(struct file *file, const char __user * buf, | |||
917 | curr_pos += 8; | 916 | curr_pos += 8; |
918 | remaining -= 8; | 917 | remaining -= 8; |
919 | 918 | ||
920 | pr_devel("client 0x%X called 'trylock'\n", (int)priv); | 919 | pr_devel("client 0x%p called 'trylock'\n", priv); |
921 | 920 | ||
922 | if (!vga_str_to_iostate(curr_pos, remaining, &io_state)) { | 921 | if (!vga_str_to_iostate(curr_pos, remaining, &io_state)) { |
923 | ret_val = -EPROTO; | 922 | ret_val = -EPROTO; |
@@ -960,7 +959,7 @@ static ssize_t vga_arb_write(struct file *file, const char __user * buf, | |||
960 | 959 | ||
961 | curr_pos += 7; | 960 | curr_pos += 7; |
962 | remaining -= 7; | 961 | remaining -= 7; |
963 | pr_devel("client 0x%X called 'target'\n", (int)priv); | 962 | pr_devel("client 0x%p called 'target'\n", priv); |
964 | /* if target is default */ | 963 | /* if target is default */ |
965 | if (!strncmp(buf, "default", 7)) | 964 | if (!strncmp(buf, "default", 7)) |
966 | pdev = pci_dev_get(vga_default_device()); | 965 | pdev = pci_dev_get(vga_default_device()); |
@@ -1014,7 +1013,7 @@ static ssize_t vga_arb_write(struct file *file, const char __user * buf, | |||
1014 | } else if (strncmp(curr_pos, "decodes ", 8) == 0) { | 1013 | } else if (strncmp(curr_pos, "decodes ", 8) == 0) { |
1015 | curr_pos += 8; | 1014 | curr_pos += 8; |
1016 | remaining -= 8; | 1015 | remaining -= 8; |
1017 | pr_devel("vgaarb: client 0x%X called 'decodes'\n", (int)priv); | 1016 | pr_devel("vgaarb: client 0x%p called 'decodes'\n", priv); |
1018 | 1017 | ||
1019 | if (!vga_str_to_iostate(curr_pos, remaining, &io_state)) { | 1018 | if (!vga_str_to_iostate(curr_pos, remaining, &io_state)) { |
1020 | ret_val = -EPROTO; | 1019 | ret_val = -EPROTO; |