Re: [PATCH V3 08/15] [media] marvell-ccic: switch to resource managed allocation and request

2013-01-02 Thread Guennadi Liakhovetski 
On Sat, 15 Dec 2012, Albert Wang wrote:

 From: Libin Yang lby...@marvell.com
 
 This patch switchs to resource managed allocation and request in mmp-driver.
 It can remove free resource operations.
 
 Signed-off-by: Albert Wang twan...@marvell.com
 Signed-off-by: Libin Yang lby...@marvell.com
 ---
  drivers/media/platform/marvell-ccic/mmp-driver.c |   56 
 --
  1 file changed, 20 insertions(+), 36 deletions(-)
 
 diff --git a/drivers/media/platform/marvell-ccic/mmp-driver.c 
 b/drivers/media/platform/marvell-ccic/mmp-driver.c
 index fec7cd8..40c243e 100755
 --- a/drivers/media/platform/marvell-ccic/mmp-driver.c
 +++ b/drivers/media/platform/marvell-ccic/mmp-driver.c
 @@ -315,7 +315,7 @@ static int mmpcam_probe(struct platform_device *pdev)
   if (!pdata)
   return -ENODEV;
  
 - cam = kzalloc(sizeof(*cam), GFP_KERNEL);
 + cam = devm_kzalloc(pdev-dev, sizeof(*cam), GFP_KERNEL);
   if (cam == NULL)
   return -ENOMEM;
   cam-pdev = pdev;
 @@ -343,14 +343,12 @@ static int mmpcam_probe(struct platform_device *pdev)
   res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
   if (res == NULL) {
   dev_err(pdev-dev, no iomem resource!\n);
 - ret = -ENODEV;
 - goto out_free;
 + return -ENODEV;
   }
 - mcam-regs = ioremap(res-start, resource_size(res));
 + mcam-regs = devm_request_and_ioremap(pdev-dev, res);
   if (mcam-regs == NULL) {
   dev_err(pdev-dev, MMIO ioremap fail\n);
 - ret = -ENODEV;
 - goto out_free;
 + return -ENODEV;
   }
   /*
* Power/clock memory is elsewhere; get it too.  Perhaps this
 @@ -359,14 +357,12 @@ static int mmpcam_probe(struct platform_device *pdev)
   res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
   if (res == NULL) {
   dev_err(pdev-dev, no power resource!\n);
 - ret = -ENODEV;
 - goto out_unmap1;
 + return -ENODEV;
   }
 - cam-power_regs = ioremap(res-start, resource_size(res));
 + cam-power_regs = devm_request_and_ioremap(pdev-dev, res);
   if (cam-power_regs == NULL) {
   dev_err(pdev-dev, power MMIO ioremap fail\n);
 - ret = -ENODEV;
 - goto out_unmap1;
 + return -ENODEV;
   }
  
   mcam_init_clk(mcam, pdata, 1);
 @@ -376,25 +372,27 @@ static int mmpcam_probe(struct platform_device *pdev)
*/
   mcam-i2c_adapter = platform_get_drvdata(pdata-i2c_device);
   if (mcam-i2c_adapter == NULL) {
 - ret = -ENODEV;
   dev_err(pdev-dev, No i2c adapter\n);
 - goto out_unmap2;
 + ret = -ENODEV;
 + goto out_uninit_clk;

Looks good in principle, but it will become a bit simpler yet after you 
change your patch 03/15 to not use mcam_init_clk() for clock 
deinitialisation, but that's going to be just a minor modification.

Thanks
Guennadi

   }
   /*
* Sensor GPIO pins.
*/
 - ret = gpio_request(pdata-sensor_power_gpio, cam-power);
 + ret = devm_gpio_request(pdev-dev, pdata-sensor_power_gpio,
 + cam-power);
   if (ret) {
   dev_err(pdev-dev, Can't get sensor power gpio %d,
   pdata-sensor_power_gpio);
 - goto out_unmap2;
 + goto out_uninit_clk;
   }
   gpio_direction_output(pdata-sensor_power_gpio, 0);
 - ret = gpio_request(pdata-sensor_reset_gpio, cam-reset);
 + ret = devm_gpio_request(pdev-dev, pdata-sensor_reset_gpio,
 + cam-reset);
   if (ret) {
   dev_err(pdev-dev, Can't get sensor reset gpio %d,
   pdata-sensor_reset_gpio);
 - goto out_gpio;
 + goto out_uninit_clk;
   }
   gpio_direction_output(pdata-sensor_reset_gpio, 0);
  
 @@ -404,7 +402,7 @@ static int mmpcam_probe(struct platform_device *pdev)
   mmpcam_power_up(mcam);
   ret = mccic_register(mcam);
   if (ret)
 - goto out_gpio2;
 + goto out_power_down;
   /*
* Finally, set up our IRQ now that the core is ready to
* deal with it.
 @@ -415,8 +413,8 @@ static int mmpcam_probe(struct platform_device *pdev)
   goto out_unregister;
   }
   cam-irq = res-start;
 - ret = request_irq(cam-irq, mmpcam_irq, IRQF_SHARED,
 - mmp-camera, mcam);
 + ret = devm_request_irq(pdev-dev, cam-irq, mmpcam_irq, IRQF_SHARED,
 + mmp-camera, mcam);
   if (ret == 0) {
   mmpcam_add_device(cam);
   return 0;
 @@ -424,18 +422,10 @@ static int mmpcam_probe(struct platform_device *pdev)
  
  out_unregister:
   mccic_shutdown(mcam);
 -out_gpio2:
 +out_power_down:
   mmpcam_power_down(mcam);
 - gpio_free(pdata-sensor_reset_gpio);

Re: [PATCH V3 08/15] [media] marvell-ccic: switch to resource managed allocation and request

2012-12-16 Thread Jonathan Corbet 
On Sat, 15 Dec 2012 17:57:57 +0800
Albert Wang twan...@marvell.com wrote:

 From: Libin Yang lby...@marvell.com
 
 This patch switchs to resource managed allocation and request in mmp-driver.
 It can remove free resource operations.

But that takes away half the challenge of getting all this stuff
right! :)

Acked-by: Jonathan Corbet cor...@lwn.net


jon
--
To unsubscribe from this list: send the line unsubscribe linux-media in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH V3 08/15] [media] marvell-ccic: switch to resource managed allocation and request

2012-12-15 Thread Albert Wang 
From: Libin Yang lby...@marvell.com

This patch switchs to resource managed allocation and request in mmp-driver.
It can remove free resource operations.

Signed-off-by: Albert Wang twan...@marvell.com
Signed-off-by: Libin Yang lby...@marvell.com
---
 drivers/media/platform/marvell-ccic/mmp-driver.c |   56 --
 1 file changed, 20 insertions(+), 36 deletions(-)

diff --git a/drivers/media/platform/marvell-ccic/mmp-driver.c 
b/drivers/media/platform/marvell-ccic/mmp-driver.c
index fec7cd8..40c243e 100755
--- a/drivers/media/platform/marvell-ccic/mmp-driver.c
+++ b/drivers/media/platform/marvell-ccic/mmp-driver.c
@@ -315,7 +315,7 @@ static int mmpcam_probe(struct platform_device *pdev)
if (!pdata)
return -ENODEV;
 
-   cam = kzalloc(sizeof(*cam), GFP_KERNEL);
+   cam = devm_kzalloc(pdev-dev, sizeof(*cam), GFP_KERNEL);
if (cam == NULL)
return -ENOMEM;
cam-pdev = pdev;
@@ -343,14 +343,12 @@ static int mmpcam_probe(struct platform_device *pdev)
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (res == NULL) {
dev_err(pdev-dev, no iomem resource!\n);
-   ret = -ENODEV;
-   goto out_free;
+   return -ENODEV;
}
-   mcam-regs = ioremap(res-start, resource_size(res));
+   mcam-regs = devm_request_and_ioremap(pdev-dev, res);
if (mcam-regs == NULL) {
dev_err(pdev-dev, MMIO ioremap fail\n);
-   ret = -ENODEV;
-   goto out_free;
+   return -ENODEV;
}
/*
 * Power/clock memory is elsewhere; get it too.  Perhaps this
@@ -359,14 +357,12 @@ static int mmpcam_probe(struct platform_device *pdev)
res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
if (res == NULL) {
dev_err(pdev-dev, no power resource!\n);
-   ret = -ENODEV;
-   goto out_unmap1;
+   return -ENODEV;
}
-   cam-power_regs = ioremap(res-start, resource_size(res));
+   cam-power_regs = devm_request_and_ioremap(pdev-dev, res);
if (cam-power_regs == NULL) {
dev_err(pdev-dev, power MMIO ioremap fail\n);
-   ret = -ENODEV;
-   goto out_unmap1;
+   return -ENODEV;
}
 
mcam_init_clk(mcam, pdata, 1);
@@ -376,25 +372,27 @@ static int mmpcam_probe(struct platform_device *pdev)
 */
mcam-i2c_adapter = platform_get_drvdata(pdata-i2c_device);
if (mcam-i2c_adapter == NULL) {
-   ret = -ENODEV;
dev_err(pdev-dev, No i2c adapter\n);
-   goto out_unmap2;
+   ret = -ENODEV;
+   goto out_uninit_clk;
}
/*
 * Sensor GPIO pins.
 */
-   ret = gpio_request(pdata-sensor_power_gpio, cam-power);
+   ret = devm_gpio_request(pdev-dev, pdata-sensor_power_gpio,
+   cam-power);
if (ret) {
dev_err(pdev-dev, Can't get sensor power gpio %d,
pdata-sensor_power_gpio);
-   goto out_unmap2;
+   goto out_uninit_clk;
}
gpio_direction_output(pdata-sensor_power_gpio, 0);
-   ret = gpio_request(pdata-sensor_reset_gpio, cam-reset);
+   ret = devm_gpio_request(pdev-dev, pdata-sensor_reset_gpio,
+   cam-reset);
if (ret) {
dev_err(pdev-dev, Can't get sensor reset gpio %d,
pdata-sensor_reset_gpio);
-   goto out_gpio;
+   goto out_uninit_clk;
}
gpio_direction_output(pdata-sensor_reset_gpio, 0);
 
@@ -404,7 +402,7 @@ static int mmpcam_probe(struct platform_device *pdev)
mmpcam_power_up(mcam);
ret = mccic_register(mcam);
if (ret)
-   goto out_gpio2;
+   goto out_power_down;
/*
 * Finally, set up our IRQ now that the core is ready to
 * deal with it.
@@ -415,8 +413,8 @@ static int mmpcam_probe(struct platform_device *pdev)
goto out_unregister;
}
cam-irq = res-start;
-   ret = request_irq(cam-irq, mmpcam_irq, IRQF_SHARED,
-   mmp-camera, mcam);
+   ret = devm_request_irq(pdev-dev, cam-irq, mmpcam_irq, IRQF_SHARED,
+   mmp-camera, mcam);
if (ret == 0) {
mmpcam_add_device(cam);
return 0;
@@ -424,18 +422,10 @@ static int mmpcam_probe(struct platform_device *pdev)
 
 out_unregister:
mccic_shutdown(mcam);
-out_gpio2:
+out_power_down:
mmpcam_power_down(mcam);
-   gpio_free(pdata-sensor_reset_gpio);
-out_gpio:
-   gpio_free(pdata-sensor_power_gpio);
-out_unmap2:
+out_uninit_clk:
mcam_init_clk(mcam, pdata, 0);
-   iounmap(cam-power_regs);
-out_unmap1:
-   iounmap(mcam-regs);