Commit 0741a951 authored by Diego Woitasen's avatar Diego Woitasen Committed by Greg Kroah-Hartman
Browse files

PCI: remove unneeded lock_kernel() in drivers/pci/syscall.c. 



sys_pciconfig_{read,write}() are protected against PCI removal with the
reference count in struct pci_dev.  The concurrency of
pci_user_{read,write}_config_* functions are already protected by pci_lock
in drivers/pci/access.c.

Signed-off-by: default avatarDiego Woitasen <diego@woitasen.com.ar>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 10d7425d

drivers/pci/syscall.c

+0 −5
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ sys_pciconfig_read(unsigned long bus, unsigned long dfn, 
	if (!dev)

		goto error;



	lock_kernel();

	switch (len) {

	case 1:

		cfg_ret = pci_user_read_config_byte(dev, off, &byte);
@@ -47,10 +46,8 @@ sys_pciconfig_read(unsigned long bus, unsigned long dfn, 
		break;

	default:

		err = -EINVAL;

		unlock_kernel();

		goto error;

	};

	unlock_kernel();



	err = -EIO;

	if (cfg_ret != PCIBIOS_SUCCESSFUL)
@@ -107,7 +104,6 @@ sys_pciconfig_write(unsigned long bus, unsigned long dfn, 
	if (!dev)

		return -ENODEV;



	lock_kernel();

	switch(len) {

	case 1:

		err = get_user(byte, (u8 __user *)buf);
@@ -140,7 +136,6 @@ sys_pciconfig_write(unsigned long bus, unsigned long dfn, 
		err = -EINVAL;

		break;

	}

	unlock_kernel();

	pci_dev_put(dev);

	return err;

}