leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

usb: host: max3421-hcd: Remove pdata test in max3421_hub_control()

Browse Source 
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: 721fdc83b3 ("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>
This commit is contained in:
Jules Maselbas 2017-10-31 11:40:33 +01:00 committed by Greg Kroah-Hartman
parent 4756f35fdf
commit 892f6ebc53
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/usb/host/max3421-hcd.c
View File

@ -1699,13 +1699,9 @@ max3421_hub_control(struct usb_hcd *hcd, u16 type_req, u16 value, u16 index,
unsigned long flags; unsigned long flags;
int retval = 0; int retval = 0;
spin_lock_irqsave(&max3421_hcd->lock, flags);
pdata = spi->dev.platform_data; pdata = spi->dev.platform_data;
if (!pdata) {
dev_err(&spi->dev, "Device platform data is missing\n"); spin_lock_irqsave(&max3421_hcd->lock, flags);
return -EFAULT;
}
switch (type_req) { switch (type_req) {
case ClearHubFeature: case ClearHubFeature:
@ -1882,7 +1878,6 @@ max3421_probe(struct spi_device *spi)
if (IS_ENABLED(CONFIG_OF) && dev->of_node) { if (IS_ENABLED(CONFIG_OF) && dev->of_node) {
pdata = devm_kzalloc(&spi->dev, sizeof(*pdata), GFP_KERNEL); pdata = devm_kzalloc(&spi->dev, sizeof(*pdata), GFP_KERNEL);
if (!pdata) { if (!pdata) {
dev_err(&spi->dev, "failed to allocate memory for private data\n");
retval = -ENOMEM; retval = -ENOMEM;
goto error; goto error;
} }
@ -1995,12 +1990,6 @@ max3421_remove(struct spi_device *spi)
spin_unlock_irqrestore(&max3421_hcd->lock, flags); 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); free_irq(spi->irq, hcd);
usb_put_hcd(hcd); usb_put_hcd(hcd);