OSDN Git Service

staging: vt6655: device_get_pci_info remove call to set master.
authorMalcolm Priestley <tvboxspy@gmail.com>
Sat, 12 Sep 2015 18:10:36 +0000 (19:10 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 14 Sep 2015 15:50:45 +0000 (08:50 -0700)
a call to PCI_COMMAND is used to set master.

However, a call to pci_set_master earlier in function which
does the same thing.

So remove the calls and variable b.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/vt6655/device_main.c

index 17fa6aa..edda836 100644 (file)
@@ -433,8 +433,6 @@ static void device_print_info(struct vnt_private *pDevice)
 static bool device_get_pci_info(struct vnt_private *pDevice,
                                struct pci_dev *pcid)
 {
-       u8  b;
-
        pci_set_master(pcid);
 
        pDevice->memaddr = pci_resource_start(pcid, 0);
@@ -442,9 +440,6 @@ static bool device_get_pci_info(struct vnt_private *pDevice,
 
        pDevice->pcid = pcid;
 
-       pci_read_config_byte(pcid, PCI_COMMAND, &b);
-       pci_write_config_byte(pcid, PCI_COMMAND, (b|PCI_COMMAND_MASTER));
-
        return true;
 }