diff options
| author |   Christophe JAILLET <christophe.jaillet@wanadoo.fr> | 2021-08-27 19:17:53 +0200 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-09-14 11:12:56 +0200 |
| commit | ff8d123f0b0ee774089f70d8e266ecd1371e84e2 (patch) | |
| tree | 3ceee5f2148cc81c93641a8597f6473741c64fbd /drivers/char | |
| parent | char: xillybus: Remove usage of remaining deprecated pci_ API (diff) | |
| download | linux-dev-ff8d123f0b0ee774089f70d8e266ecd1371e84e2.tar.xz linux-dev-ff8d123f0b0ee774089f70d8e266ecd1371e84e2.zip | |
char: xillybus: Simplify 'xillybus_init_endpoint()'
Ths first argument of 'xillybus_init_endpoint()' is now useless.
Remove it.
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Link: https://lore.kernel.org/r/ba687c1eff5dc8f21422323f57164d06f25d4169.1630083668.git.christophe.jaillet@wanadoo.fr
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/xillybus/xillybus.h | 3 | ||||
| -rw-r--r-- | drivers/char/xillybus/xillybus_core.c | 4 | ||||
| -rw-r--r-- | drivers/char/xillybus/xillybus_of.c | 2 | ||||
| -rw-r--r-- | drivers/char/xillybus/xillybus_pcie.c | 2 |
4 files changed, 4 insertions, 7 deletions
diff --git a/drivers/char/xillybus/xillybus.h b/drivers/char/xillybus/xillybus.h index 55d47cb13a7b..afce5bb4d127 100644 --- a/drivers/char/xillybus/xillybus.h +++ b/drivers/char/xillybus/xillybus.h @@ -134,8 +134,7 @@ struct xilly_mapping { irqreturn_t xillybus_isr(int irq, void *data); -struct xilly_endpoint *xillybus_init_endpoint(struct pci_dev *pdev, - struct device *dev, +struct xilly_endpoint *xillybus_init_endpoint(struct device *dev, struct xilly_endpoint_hardware *ephw); diff --git a/drivers/char/xillybus/xillybus_core.c b/drivers/char/xillybus/xillybus_core.c index 0ced9ec6977f..02f30140c2d5 100644 --- a/drivers/char/xillybus/xillybus_core.c +++ b/drivers/char/xillybus/xillybus_core.c @@ -1772,8 +1772,7 @@ static const struct file_operations xillybus_fops = { .poll = xillybus_poll, }; -struct xilly_endpoint *xillybus_init_endpoint(struct pci_dev *pdev, - struct device *dev, +struct xilly_endpoint *xillybus_init_endpoint(struct device *dev, struct xilly_endpoint_hardware *ephw) { @@ -1783,7 +1782,6 @@ struct xilly_endpoint *xillybus_init_endpoint(struct pci_dev *pdev, if (!endpoint) return NULL; - (void)pdev; // silence a compiler warning, will be removed endpoint->dev = dev; endpoint->ephw = ephw; endpoint->msg_counter = 0x0b; diff --git a/drivers/char/xillybus/xillybus_of.c b/drivers/char/xillybus/xillybus_of.c index 1a20b286fd1d..4e6e0c19d8c8 100644 --- a/drivers/char/xillybus/xillybus_of.c +++ b/drivers/char/xillybus/xillybus_of.c @@ -120,7 +120,7 @@ static int xilly_drv_probe(struct platform_device *op) if (of_property_read_bool(dev->of_node, "dma-coherent")) ephw = &of_hw_coherent; - endpoint = xillybus_init_endpoint(NULL, dev, ephw); + endpoint = xillybus_init_endpoint(dev, ephw); if (!endpoint) return -ENOMEM; diff --git a/drivers/char/xillybus/xillybus_pcie.c b/drivers/char/xillybus/xillybus_pcie.c index f4be61349ca6..a6ef4ce90649 100644 --- a/drivers/char/xillybus/xillybus_pcie.c +++ b/drivers/char/xillybus/xillybus_pcie.c @@ -124,7 +124,7 @@ static int xilly_probe(struct pci_dev *pdev, struct xilly_endpoint *endpoint; int rc; - endpoint = xillybus_init_endpoint(pdev, &pdev->dev, &pci_hw); + endpoint = xillybus_init_endpoint(&pdev->dev, &pci_hw); if (!endpoint) return -ENOMEM; |