PCI/vgaarb: cleanup some warnings + cleanup some comments.
Fix some warnings reported in linux-next + also cleanup some comment errors noticed by Pekka Paalanen. Signed-off-by: Dave Airlie <airlied@redhat.com> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
This commit is contained in:
committed by
Jesse Barnes
parent
6e19314cc9
commit
6ac3bd5270
@@ -609,7 +609,6 @@ void vga_set_legacy_decoding(struct pci_dev *pdev, unsigned int decodes)
|
||||
}
|
||||
EXPORT_SYMBOL(vga_set_legacy_decoding);
|
||||
|
||||
/* return number of active VGA devices */
|
||||
/* call with NULL to unregister */
|
||||
int vga_client_register(struct pci_dev *pdev, void *cookie,
|
||||
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,
|
||||
curr_pos += 5;
|
||||
remaining -= 5;
|
||||
|
||||
pr_devel("client 0x%X called 'lock'\n", (int)priv);
|
||||
pr_devel("client 0x%p called 'lock'\n", priv);
|
||||
|
||||
if (!vga_str_to_iostate(curr_pos, remaining, &io_state)) {
|
||||
ret_val = -EPROTO;
|
||||
@@ -867,7 +866,7 @@ static ssize_t vga_arb_write(struct file *file, const char __user * buf,
|
||||
curr_pos += 7;
|
||||
remaining -= 7;
|
||||
|
||||
pr_devel("client 0x%X called 'unlock'\n", (int)priv);
|
||||
pr_devel("client 0x%p called 'unlock'\n", priv);
|
||||
|
||||
if (strncmp(curr_pos, "all", 3) == 0)
|
||||
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,
|
||||
curr_pos += 8;
|
||||
remaining -= 8;
|
||||
|
||||
pr_devel("client 0x%X called 'trylock'\n", (int)priv);
|
||||
pr_devel("client 0x%p called 'trylock'\n", priv);
|
||||
|
||||
if (!vga_str_to_iostate(curr_pos, remaining, &io_state)) {
|
||||
ret_val = -EPROTO;
|
||||
@@ -960,7 +959,7 @@ static ssize_t vga_arb_write(struct file *file, const char __user * buf,
|
||||
|
||||
curr_pos += 7;
|
||||
remaining -= 7;
|
||||
pr_devel("client 0x%X called 'target'\n", (int)priv);
|
||||
pr_devel("client 0x%p called 'target'\n", priv);
|
||||
/* if target is default */
|
||||
if (!strncmp(buf, "default", 7))
|
||||
pdev = pci_dev_get(vga_default_device());
|
||||
@@ -1014,7 +1013,7 @@ static ssize_t vga_arb_write(struct file *file, const char __user * buf,
|
||||
} else if (strncmp(curr_pos, "decodes ", 8) == 0) {
|
||||
curr_pos += 8;
|
||||
remaining -= 8;
|
||||
pr_devel("vgaarb: client 0x%X called 'decodes'\n", (int)priv);
|
||||
pr_devel("vgaarb: client 0x%p called 'decodes'\n", priv);
|
||||
|
||||
if (!vga_str_to_iostate(curr_pos, remaining, &io_state)) {
|
||||
ret_val = -EPROTO;
|
||||
|
Reference in New Issue
Block a user