PCI/VGA: drop the inline of vga_update_device_decodes() function
PATCH 2/2 PCI/VGA: drop the inline of vga_update_device_decodes() function
From: Sui Jingfeng <[email protected]>
The vga_update_device_decodes() is NOT a trivial function, nor performance critical. So drop the inline. Also keep the parameter and argument consistent. The second argument should declared as 'unsigned int' type.
Signed-off-by Sui Jingfeng <[email protected]>
--- drivers/pci/vgaarb.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
drivers/pci/vgaarb.c +10 -10
@@ -877,21 +877,21 @@ static bool vga_arbiter_del_pci_device(struct pci_dev *pdev) }/* This is called with the lock */ -static inline void vga_update_device_decodes (struct vga_device *vgadev, -int new_decodes) +static void vga_update_device_decodes (struct vga_device *vgadev, +unsigned int new_decodes) {struct device *dev = &vgadev->pdev->dev; -int old_decodes, decodes_removed, decodes_unlocked; +unsigned int old_decodes = vgadev->decodes; +unsigned int decodes_removed = ~new_decodes & old_decodes; +unsigned int decodes_unlocked = vgadev->locks & decodes_removed; - old_decodes = vgadev->decodes; - decodes_removed = ~new_decodes & old_decodes; - decodes_unlocked = vgadev->locks & decodes_removed; vgadev->decodes = new_decodes; -vgaarb_info (dev,"changed VGA decodes: olddecodes=%s,decodes=%s:owns=%s\n" , -vga_iostate_to_str (old_decodes), -vga_iostate_to_str (vgadev->decodes), -vga_iostate_to_str (vgadev->owns)); +vgaarb_info (dev, +"VGA decodes changed: olddecodes=%s,decodes=%s:owns=%s\n" , +vga_iostate_to_str (old_decodes), +vga_iostate_to_str (vgadev->decodes), +vga_iostate_to_str (vgadev->owns));/* If we removed locked decodes, lock count goes to zero, and release */ if (decodes_unlocked) {
Signature · 1 line
2.25.1