Commit 071b38ee authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'for-6.15/intel-thc' into for-linus 

- removal of deprecated PCI API calls (Philipp Stanner)
- code cleanups (Even Xu)
parents 77049352 f97455f9

drivers/hid/intel-thc-hid/intel-quicki2c/pci-quicki2c.c

+5 −9
Original line number Diff line number Diff line
@@ -557,20 +557,19 @@ static int quicki2c_probe(struct pci_dev *pdev, 


	pci_set_master(pdev);



	ret = pcim_iomap_regions(pdev, BIT(0), KBUILD_MODNAME);

	mem_addr = pcim_iomap_region(pdev, 0, KBUILD_MODNAME);

	ret = PTR_ERR_OR_ZERO(mem_addr);

	if (ret) {

		dev_err_once(&pdev->dev, "Failed to get PCI regions, ret = %d.\n", ret);

		goto disable_pci_device;

	}



	mem_addr = pcim_iomap_table(pdev)[0];



	ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));

	if (ret) {

		ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));

		if (ret) {

			dev_err_once(&pdev->dev, "No usable DMA configuration %d\n", ret);

			goto unmap_io_region;

			goto disable_pci_device;

		}

	}
@@ -578,7 +577,7 @@ static int quicki2c_probe(struct pci_dev *pdev, 
	if (ret < 0) {

		dev_err_once(&pdev->dev,

			     "Failed to allocate IRQ vectors. ret = %d\n", ret);

		goto unmap_io_region;

		goto disable_pci_device;

	}



	pdev->irq = pci_irq_vector(pdev, 0);
@@ -587,7 +586,7 @@ static int quicki2c_probe(struct pci_dev *pdev, 
	if (IS_ERR(qcdev)) {

		dev_err_once(&pdev->dev, "QuickI2C device init failed\n");

		ret = PTR_ERR(qcdev);

		goto unmap_io_region;

		goto disable_pci_device;

	}



	pci_set_drvdata(pdev, qcdev);
@@ -666,8 +665,6 @@ static int quicki2c_probe(struct pci_dev *pdev, 
	quicki2c_dma_deinit(qcdev);

dev_deinit:

	quicki2c_dev_deinit(qcdev);

unmap_io_region:

	pcim_iounmap_regions(pdev, BIT(0));

disable_pci_device:

	pci_clear_master(pdev);
@@ -697,7 +694,6 @@ static void quicki2c_remove(struct pci_dev *pdev) 


	quicki2c_dev_deinit(qcdev);



	pcim_iounmap_regions(pdev, BIT(0));

	pci_clear_master(pdev);

}

drivers/hid/intel-thc-hid/intel-quickspi/pci-quickspi.c

+6 −10
Original line number Diff line number Diff line
@@ -426,7 +426,7 @@ static struct quickspi_device *quickspi_dev_init(struct pci_dev *pdev, void __io 


	thc_interrupt_enable(qsdev->thc_hw, true);



	qsdev->state = QUICKSPI_INITED;

	qsdev->state = QUICKSPI_INITIATED;



	return qsdev;

}
@@ -575,20 +575,19 @@ static int quickspi_probe(struct pci_dev *pdev, 


	pci_set_master(pdev);



	ret = pcim_iomap_regions(pdev, BIT(0), KBUILD_MODNAME);

	mem_addr = pcim_iomap_region(pdev, 0, KBUILD_MODNAME);

	ret = PTR_ERR_OR_ZERO(mem_addr);

	if (ret) {

		dev_err(&pdev->dev, "Failed to get PCI regions, ret = %d.\n", ret);

		goto disable_pci_device;

	}



	mem_addr = pcim_iomap_table(pdev)[0];



	ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));

	if (ret) {

		ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));

		if (ret) {

			dev_err(&pdev->dev, "No usable DMA configuration %d\n", ret);

			goto unmap_io_region;

			goto disable_pci_device;

		}

	}
@@ -596,7 +595,7 @@ static int quickspi_probe(struct pci_dev *pdev, 
	if (ret < 0) {

		dev_err(&pdev->dev,

			"Failed to allocate IRQ vectors. ret = %d\n", ret);

		goto unmap_io_region;

		goto disable_pci_device;

	}



	pdev->irq = pci_irq_vector(pdev, 0);
@@ -605,7 +604,7 @@ static int quickspi_probe(struct pci_dev *pdev, 
	if (IS_ERR(qsdev)) {

		dev_err(&pdev->dev, "QuickSPI device init failed\n");

		ret = PTR_ERR(qsdev);

		goto unmap_io_region;

		goto disable_pci_device;

	}



	pci_set_drvdata(pdev, qsdev);
@@ -668,8 +667,6 @@ static int quickspi_probe(struct pci_dev *pdev, 
	quickspi_dma_deinit(qsdev);

dev_deinit:

	quickspi_dev_deinit(qsdev);

unmap_io_region:

	pcim_iounmap_regions(pdev, BIT(0));

disable_pci_device:

	pci_clear_master(pdev);
@@ -699,7 +696,6 @@ static void quickspi_remove(struct pci_dev *pdev) 


	quickspi_dev_deinit(qsdev);



	pcim_iounmap_regions(pdev, BIT(0));

	pci_clear_master(pdev);

}

drivers/hid/intel-thc-hid/intel-quickspi/quickspi-dev.h

+2 −2
Original line number Diff line number Diff line
@@ -57,9 +57,9 @@ 


enum quickspi_dev_state {

	QUICKSPI_NONE,

	QUICKSPI_INITIATED,

	QUICKSPI_RESETING,

	QUICKSPI_RESETED,

	QUICKSPI_INITED,

	QUICKSPI_RESET,

	QUICKSPI_ENABLED,

	QUICKSPI_DISABLED,

};

drivers/hid/intel-thc-hid/intel-quickspi/quickspi-protocol.c

+1 −1
Original line number Diff line number Diff line
@@ -333,7 +333,7 @@ int reset_tic(struct quickspi_device *qsdev) 
		return -EINVAL;

	}



	qsdev->state = QUICKSPI_RESETED;

	qsdev->state = QUICKSPI_RESET;



	ret = quickspi_get_device_descriptor(qsdev);

	if (ret)

drivers/hid/intel-thc-hid/intel-thc/intel-thc-dma.c

+1 −1
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ static void release_dma_buffers(struct thc_device *dev, 
		return;



	for (i = 0; i < config->prd_tbl_num; i++) {

		if (!config->sgls[i] | !config->sgls_nent[i])

		if (!config->sgls[i] || !config->sgls_nent[i])

			continue;



		dma_unmap_sg(dev->dev, config->sgls[i],