On 07/04/2012 06:11 PM, Mark Brown wrote:
> Saves some error handling and a small amount of code.
>
> Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
> Acked-by: Linus Walleij <linus.walleij@xxxxxxxxxx>
> ---
> drivers/spi/spi-s3c64xx.c | 25 +------------------------
> 1 file changed, 1 insertion(+), 24 deletions(-)
>
> diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c
> index f4e2341..b7aeb5d 100644
> --- a/drivers/spi/spi-s3c64xx.c
> +++ b/drivers/spi/spi-s3c64xx.c
> @@ -1028,19 +1028,7 @@ static int __init s3c64xx_spi_probe(struct platform_device *pdev)
> /* the spi->mode bits understood by this driver: */
> master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH;
>
> - if (request_mem_region(mem_res->start,
> - resource_size(mem_res), pdev->name) == NULL) {
> - dev_err(&pdev->dev, "Req mem region failed\n");
> - ret = -ENXIO;
> - goto err0;
> - }
> -
> - sdd->regs = ioremap(mem_res->start, resource_size(mem_res));
> - if (sdd->regs == NULL) {
> - dev_err(&pdev->dev, "Unable to remap IO\n");
> - ret = -ENXIO;
> - goto err1;
> - }
> + sdd->regs = devm_request_and_ioremap(&pdev->dev, mem_res);
It doesn't seem right. Why is is the check for valid sdd->regs removed ?
This should have rather been:
+ sdd->regs = devm_request_and_ioremap(&pdev->dev, mem_res);
+ if (sdd->regs == NULL) {
+ dev_err(&pdev->dev, "Failed to request memory region\n");
+ return -ENXIO;
+ }
Currently whne devm_request_and_ioremap() fails and returns NULL kernel oops
would happen right on first writel() in s3c64xx_spi_hwninit().
Thanks,
Sylwester
> if (sci->cfg_gpio == NULL || sci->cfg_gpio(pdev)) {
> dev_err(&pdev->dev, "Unable to config gpio\n");
> @@ -1124,10 +1112,6 @@ err4:
> clk_put(sdd->clk);
> err3:
> err2:
> - iounmap((void *) sdd->regs);
> -err1:
> - release_mem_region(mem_res->start, resource_size(mem_res));
> -err0:
> platform_set_drvdata(pdev, NULL);
> spi_master_put(master);
>
> @@ -1138,7 +1122,6 @@ static int s3c64xx_spi_remove(struct platform_device *pdev)
> {
> struct spi_master *master = spi_master_get(platform_get_drvdata(pdev));
> struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master);
> - struct resource *mem_res;
>
> pm_runtime_disable(&pdev->dev);
>
> @@ -1154,12 +1137,6 @@ static int s3c64xx_spi_remove(struct platform_device *pdev)
> clk_disable(sdd->clk);
> clk_put(sdd->clk);
>
> - iounmap((void *) sdd->regs);
> -
> - mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> - if (mem_res != NULL)
> - release_mem_region(mem_res->start, resource_size(mem_res));
> -
> platform_set_drvdata(pdev, NULL);
> spi_master_put(master);
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
