Re: [PATCH v3] drivers/ata/pata_mpc52xx.c: clean up error handlingcode

From: Jeff Garzik
Date: Tue Mar 13 2012 - 16:45:44 EST


On 03/11/2012 04:12 PM, Julia Lawall wrote:
From: Julia Lawall<Julia.Lawall@xxxxxxx>

This patch makes a number of changes with respect to the error-handling
code:

* Remove cleanup calls for the devm functions in both the error handling
code and the remove function. This cleanup is done automatically.

* The previous change simplifies the cleanup code at the end of the
function such that there is nothing to do on the failure of the call to
devm_ioremap. So it is changed to just return directly.

* There is no need for the ifs in the cleanup code at the end of the
function, because in each case the cleanup needed is statically
known. Drop the ifs, add new err labels, and drop the initializations of
the tested variables to NULL.

* Change the call to request_irq to a call to devm_request_irq, so that it
is cleaned up on exit.

* Cause the return value of devm_request_irq to go into the returned
variable rv rather than the unused variable ret. Drop ret.

Signed-off-by: Julia Lawall<Julia.Lawall@xxxxxxx>

---
This subsumes the previous patch that only removed the calls to the devm
cleanup functions. It is not tested. I am not sure about the correctness
of the use of devm_request_irq, since there were no calls to free_irq
before. I also don't know if there was a reason for not returning the
return value of request_irq previously.

drivers/ata/pata_mpc52xx.c | 44 +++++++++++++++-----------------------------
1 file changed, 15 insertions(+), 29 deletions(-)

applied



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/