Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3680b1f6 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by David S. Miller
Browse files

mlxsw: convert to pci_alloc_irq_vectors 



Trivial conversion as only one vector is supported, but at least we
lose the useless msix_entry member in the per-device structure.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarJiri Pirko <jiri@mellanox.com>
Reviewed-by: default avatarIdo Schimmel <idosch@mellanox.com>
Tested-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4244de1c

drivers/net/ethernet/mellanox/mlxsw/pci.c

+6 −7
Original line number Diff line number Diff line
@@ -136,7 +136,6 @@ struct mlxsw_pci { 
	u8 __iomem *hw_addr;

	struct mlxsw_pci_queue_type_group queues[MLXSW_PCI_QUEUE_TYPE_COUNT];

	u32 doorbell_offset;

	struct msix_entry msix_entry;

	struct mlxsw_core *core;

	struct {

		struct mlxsw_pci_mem_item *items;
@@ -1409,7 +1408,7 @@ static int mlxsw_pci_init(void *bus_priv, struct mlxsw_core *mlxsw_core, 
	if (err)

		goto err_aqs_init;



	err = request_irq(mlxsw_pci->msix_entry.vector,

	err = request_irq(pci_irq_vector(pdev, 0),

			  mlxsw_pci_eq_irq_handler, 0,

			  mlxsw_pci->bus_info.device_kind, mlxsw_pci);

	if (err) {
@@ -1442,7 +1441,7 @@ static void mlxsw_pci_fini(void *bus_priv) 
{

	struct mlxsw_pci *mlxsw_pci = bus_priv;



	free_irq(mlxsw_pci->msix_entry.vector, mlxsw_pci);

	free_irq(pci_irq_vector(mlxsw_pci->pdev, 0), mlxsw_pci);

	mlxsw_pci_aqs_fini(mlxsw_pci);

	mlxsw_pci_fw_area_fini(mlxsw_pci);

	mlxsw_pci_mbox_free(mlxsw_pci, &mlxsw_pci->cmd.out_mbox);
@@ -1717,8 +1716,8 @@ static int mlxsw_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
		goto err_sw_reset;

	}



	err = pci_enable_msix_exact(pdev, &mlxsw_pci->msix_entry, 1);

	if (err) {

	err = pci_alloc_irq_vectors(pdev, 1, 1, PCI_IRQ_MSIX);

	if (err < 0) {

		dev_err(&pdev->dev, "MSI-X init failed\n");

		goto err_msix_init;

	}
@@ -1737,7 +1736,7 @@ static int mlxsw_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	return 0;



err_bus_device_register:

	pci_disable_msix(mlxsw_pci->pdev);

	pci_free_irq_vectors(mlxsw_pci->pdev);

err_msix_init:

err_sw_reset:

	iounmap(mlxsw_pci->hw_addr);
@@ -1757,7 +1756,7 @@ static void mlxsw_pci_remove(struct pci_dev *pdev) 
	struct mlxsw_pci *mlxsw_pci = pci_get_drvdata(pdev);



	mlxsw_core_bus_device_unregister(mlxsw_pci->core);

	pci_disable_msix(mlxsw_pci->pdev);

	pci_free_irq_vectors(mlxsw_pci->pdev);

	iounmap(mlxsw_pci->hw_addr);

	pci_release_regions(mlxsw_pci->pdev);

	pci_disable_device(mlxsw_pci->pdev);