media: atomisp: Unify pdev to be pointer to struct pci_device (89027fea) · Commits · 戴 / test

drivers/staging/media/atomisp/pci/atomisp_cmd.c

+12 −12

Original line number	Diff line number	Diff line
		@@ -360,39 +360,39 @@ static void clear_isp_irq(enum hrt_isp_css_irq irq)

		void atomisp_msi_irq_init(struct atomisp_device *isp)
		{
		struct pci_dev *dev = to_pci_dev(isp->dev);
		struct pci_dev *pdev = to_pci_dev(isp->dev);
		u32 msg32;
		u16 msg16;

		pci_read_config_dword(dev, PCI_MSI_CAPID, &msg32);
		pci_read_config_dword(pdev, PCI_MSI_CAPID, &msg32);
		msg32 \|= 1 << MSI_ENABLE_BIT;
		pci_write_config_dword(dev, PCI_MSI_CAPID, msg32);
		pci_write_config_dword(pdev, PCI_MSI_CAPID, msg32);

		msg32 = (1 << INTR_IER) \| (1 << INTR_IIR);
		pci_write_config_dword(dev, PCI_INTERRUPT_CTRL, msg32);
		pci_write_config_dword(pdev, PCI_INTERRUPT_CTRL, msg32);

		pci_read_config_word(dev, PCI_COMMAND, &msg16);
		pci_read_config_word(pdev, PCI_COMMAND, &msg16);
		msg16 \|= (PCI_COMMAND_MEMORY \| PCI_COMMAND_MASTER \|
		PCI_COMMAND_INTX_DISABLE);
		pci_write_config_word(dev, PCI_COMMAND, msg16);
		pci_write_config_word(pdev, PCI_COMMAND, msg16);
		}

		void atomisp_msi_irq_uninit(struct atomisp_device *isp)
		{
		struct pci_dev *dev = to_pci_dev(isp->dev);
		struct pci_dev *pdev = to_pci_dev(isp->dev);
		u32 msg32;
		u16 msg16;

		pci_read_config_dword(dev, PCI_MSI_CAPID, &msg32);
		pci_read_config_dword(pdev, PCI_MSI_CAPID, &msg32);
		msg32 &= ~(1 << MSI_ENABLE_BIT);
		pci_write_config_dword(dev, PCI_MSI_CAPID, msg32);
		pci_write_config_dword(pdev, PCI_MSI_CAPID, msg32);

		msg32 = 0x0;
		pci_write_config_dword(dev, PCI_INTERRUPT_CTRL, msg32);
		pci_write_config_dword(pdev, PCI_INTERRUPT_CTRL, msg32);

		pci_read_config_word(dev, PCI_COMMAND, &msg16);
		pci_read_config_word(pdev, PCI_COMMAND, &msg16);
		msg16 &= ~(PCI_COMMAND_MASTER);
		pci_write_config_word(dev, PCI_COMMAND, msg16);
		pci_write_config_word(pdev, PCI_COMMAND, msg16);
		}

		static void atomisp_sof_event(struct atomisp_sub_device *asd)

drivers/staging/media/atomisp/pci/atomisp_gmin_platform.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -1323,10 +1323,10 @@ EXPORT_SYMBOL_GPL(camera_sensor_csi);
		* trying. The driver itself does direct calls to the PUNIT to manage
		* ISP power.
		*/
		static void isp_pm_cap_fixup(struct pci_dev *dev)
		static void isp_pm_cap_fixup(struct pci_dev *pdev)
		{
		dev_info(&dev->dev, "Disabling PCI power management on camera ISP\n");
		dev->pm_cap = 0;
		dev_info(&pdev->dev, "Disabling PCI power management on camera ISP\n");
		pdev->pm_cap = 0;
		}
		DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0f38, isp_pm_cap_fixup);

drivers/staging/media/atomisp/pci/atomisp_v4l2.c

+112 −136

File changed.

Preview size limit exceeded, changes collapsed.

Admin message