| Message ID | 1406277374-559-1-git-send-email-tklauser@distanz.ch |
|---|---|
| State | Accepted |
| Headers | show |
On Fri, Jul 25, 2014 at 10:36:14AM +0200, Tobias Klauser wrote: > The variable retval in pci_add_dynid() is only used to store the return > value of driver_attach() and is then directly returned. Remove the > variable and directly pass on driver_attach()'s return value. > > Signed-off-by: Tobias Klauser <tklauser@distanz.ch> Applied to pci/misc for v3.18, thanks! > --- > drivers/pci/pci-driver.c | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) > > diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c > index d04c5ad..2b3c894 100644 > --- a/drivers/pci/pci-driver.c > +++ b/drivers/pci/pci-driver.c > @@ -55,7 +55,6 @@ int pci_add_dynid(struct pci_driver *drv, > unsigned long driver_data) > { > struct pci_dynid *dynid; > - int retval; > > dynid = kzalloc(sizeof(*dynid), GFP_KERNEL); > if (!dynid) > @@ -73,9 +72,7 @@ int pci_add_dynid(struct pci_driver *drv, > list_add_tail(&dynid->node, &drv->dynids.list); > spin_unlock(&drv->dynids.lock); > > - retval = driver_attach(&drv->driver); > - > - return retval; > + return driver_attach(&drv->driver); > } > EXPORT_SYMBOL_GPL(pci_add_dynid); > > -- > 2.0.1 > > -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index d04c5ad..2b3c894 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -55,7 +55,6 @@ int pci_add_dynid(struct pci_driver *drv, unsigned long driver_data) { struct pci_dynid *dynid; - int retval; dynid = kzalloc(sizeof(*dynid), GFP_KERNEL); if (!dynid) @@ -73,9 +72,7 @@ int pci_add_dynid(struct pci_driver *drv, list_add_tail(&dynid->node, &drv->dynids.list); spin_unlock(&drv->dynids.lock); - retval = driver_attach(&drv->driver); - - return retval; + return driver_attach(&drv->driver); } EXPORT_SYMBOL_GPL(pci_add_dynid);
The variable retval in pci_add_dynid() is only used to store the return value of driver_attach() and is then directly returned. Remove the variable and directly pass on driver_attach()'s return value. Signed-off-by: Tobias Klauser <tklauser@distanz.ch> --- drivers/pci/pci-driver.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)