Staging: b3dfg: remove check for pci bus master
authorVasilis Liaskovitis <vliaskov@gmail.com>
Tue, 22 Sep 2009 06:11:56 +0000 (01:11 -0500)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 11 Dec 2009 20:21:46 +0000 (12:21 -0800)
Remove unneccesary check for pci master in enable_transmission()

Signed-off-by: Vasilis Liaskovitis <vliaskov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/b3dfg/b3dfg.c

index cda26bb..4a43c51 100644 (file)
@@ -468,7 +468,6 @@ static int get_wand_status(struct b3dfg_dev *fgdev, int __user *arg)
 
 static int enable_transmission(struct b3dfg_dev *fgdev)
 {
-       u16 command;
        unsigned long flags;
        struct device *dev = &fgdev->pdev->dev;
 
@@ -480,17 +479,6 @@ static int enable_transmission(struct b3dfg_dev *fgdev)
                return -EINVAL;
        }
 
-       /*
-        * Check we're a bus master.
-        * TODO: I think we can remove this having added the pci_set_master call
-        */
-       pci_read_config_word(fgdev->pdev, PCI_COMMAND, &command);
-       if (!(command & PCI_COMMAND_MASTER)) {
-               dev_err(dev, "not a bus master, force-enabling\n");
-               pci_write_config_word(fgdev->pdev, PCI_COMMAND,
-                       command | PCI_COMMAND_MASTER);
-       }
-
        spin_lock_irqsave(&fgdev->buffer_lock, flags);
 
        /* Handle racing enable_transmission calls. */