Commit ff8d123f authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Greg Kroah-Hartman
Browse files

char: xillybus: Simplify 'xillybus_init_endpoint()'

parent 3e053c44
Loading
Loading
Loading
Loading
+1 −2
Original line number Diff line number Diff line
@@ -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);

+1 −3
Original line number Diff line number Diff line
@@ -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;
+1 −1
Original line number Diff line number Diff line
@@ -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;
+1 −1
Original line number Diff line number Diff line
@@ -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;