Commit 34a07e65 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Mauro Carvalho Chehab
Browse files

media: ipu3-cio2: Get rid of pci_set_master() duplication 



It's unclear why driver repeats the code from PCI core.
Drop it for good.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 44677b03

drivers/media/pci/intel/ipu3/ipu3-cio2.c

+5 −21
Original line number Diff line number Diff line
@@ -1708,24 +1708,6 @@ static void cio2_queues_exit(struct cio2_device *cio2) 


/**************** PCI interface ****************/



static int cio2_pci_config_setup(struct pci_dev *dev)

{

	u16 pci_command;

	int r = pci_enable_msi(dev);



	if (r) {

		dev_err(&dev->dev, "failed to enable MSI (%d)\n", r);

		return r;

	}



	pci_read_config_word(dev, PCI_COMMAND, &pci_command);

	pci_command |= PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER |

		PCI_COMMAND_INTX_DISABLE;

	pci_write_config_word(dev, PCI_COMMAND, pci_command);



	return 0;

}



static int cio2_pci_probe(struct pci_dev *pci_dev,

			  const struct pci_device_id *id)

{
@@ -1771,9 +1753,11 @@ static int cio2_pci_probe(struct pci_dev *pci_dev, 
		return -ENODEV;

	}



	r = cio2_pci_config_setup(pci_dev);

	if (r)

		return -ENODEV;

	r = pci_enable_msi(pci_dev);

	if (r) {

		dev_err(&pci_dev->dev, "failed to enable MSI (%d)\n", r);

		return r;

	}



	r = cio2_fbpt_init_dummy(cio2);

	if (r)

CRA Git | Maintained and supported by SUSTech CRA and CCSE