diff options
| author | Jules Maselbas <jules.maselbas@grenoble-inp.org> | 2017-10-31 11:40:33 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-11-01 17:11:05 +0100 |
| commit | 892f6ebc53ac1a12a26c21eb26d18064461a7007 (patch) | |
| tree | 72050dfbb143115a0fe20fdd93f035a8f43c6c96 /drivers/usb | |
| parent | 4756f35fdf1403f7f7afaed67a16b6c4a702b903 (diff) | |
usb: host: max3421-hcd: Remove pdata test in max3421_hub_control()
We do not have to test if platform_data pointer is null in
max3421_hub_control(), as the driver probe will fail if no
platform_data is found.
Fixes: 721fdc83b31b ("usb: max3421: Add devicetree support")
Signed-off-by: Jules Maselbas <jules.maselbas@grenoble-inp.org>
Reported-by: Julia Lawall <julia.lawall@lip6.fr>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/host/max3421-hcd.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/drivers/usb/host/max3421-hcd.c b/drivers/usb/host/max3421-hcd.c index 928a5aabee02..02bbf8938bb9 100644 --- a/drivers/usb/host/max3421-hcd.c +++ b/drivers/usb/host/max3421-hcd.c @@ -1699,13 +1699,9 @@ max3421_hub_control(struct usb_hcd *hcd, u16 type_req, u16 value, u16 index, unsigned long flags; int retval = 0; - spin_lock_irqsave(&max3421_hcd->lock, flags); - pdata = spi->dev.platform_data; - if (!pdata) { - dev_err(&spi->dev, "Device platform data is missing\n"); - return -EFAULT; - } + + spin_lock_irqsave(&max3421_hcd->lock, flags); switch (type_req) { case ClearHubFeature: @@ -1882,7 +1878,6 @@ max3421_probe(struct spi_device *spi) if (IS_ENABLED(CONFIG_OF) && dev->of_node) { pdata = devm_kzalloc(&spi->dev, sizeof(*pdata), GFP_KERNEL); if (!pdata) { - dev_err(&spi->dev, "failed to allocate memory for private data\n"); retval = -ENOMEM; goto error; } @@ -1995,12 +1990,6 @@ max3421_remove(struct spi_device *spi) spin_unlock_irqrestore(&max3421_hcd->lock, flags); - if (IS_ENABLED(CONFIG_OF) && spi->dev.platform_data) { - dev_dbg(&spi->dev, "Freeing platform data structure\n"); - devm_kfree(&spi->dev, spi->dev.platform_data); - spi->dev.platform_data = NULL; - } - free_irq(spi->irq, hcd); usb_put_hcd(hcd); |