| Message ID | 1370079884.29224.16.camel@localhost.localdomain (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Thomas Meyer <thomas@m3y3r.de> writes: > Signed-off-by: Thomas Meyer <thomas@m3y3r.de> Could use a changelog, but otherwise Acked-by: Kevin Hilman <khilman@linaro.org> > --- > > diff -u -p a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c > --- a/arch/arm/mach-omap2/devices.c > +++ b/arch/arm/mach-omap2/devices.c > @@ -66,7 +66,7 @@ static int __init omap3_l3_init(void) > > WARN(IS_ERR(pdev), "could not build omap_device for %s\n", oh_name); > > - return IS_ERR(pdev) ? PTR_ERR(pdev) : 0; > + return PTR_RET(pdev); > } > omap_postcore_initcall(omap3_l3_init); > > @@ -100,7 +100,7 @@ static int __init omap4_l3_init(void) > > WARN(IS_ERR(pdev), "could not build omap_device for %s\n", oh_name); > > - return IS_ERR(pdev) ? PTR_ERR(pdev) : 0; > + return PTR_RET(pdev); > } > omap_postcore_initcall(omap4_l3_init); > > diff -u -p a/arch/arm/mach-omap2/fb.c b/arch/arm/mach-omap2/fb.c > --- a/arch/arm/mach-omap2/fb.c > +++ b/arch/arm/mach-omap2/fb.c > @@ -83,10 +83,7 @@ static int __init omap_init_vrfb(void) > pdev = platform_device_register_resndata(NULL, "omapvrfb", -1, > res, num_res, NULL, 0); > > - if (IS_ERR(pdev)) > - return PTR_ERR(pdev); > - else > - return 0; > + return PTR_RET(pdev); > } > > omap_arch_initcall(omap_init_vrfb); > diff -u -p a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c > --- a/arch/arm/mach-omap2/gpmc.c > +++ b/arch/arm/mach-omap2/gpmc.c > @@ -1678,7 +1678,7 @@ static int __init omap_gpmc_init(void) > pdev = omap_device_build(DEVICE_NAME, -1, oh, NULL, 0); > WARN(IS_ERR(pdev), "could not build omap_device for %s\n", oh_name); > > - return IS_ERR(pdev) ? PTR_ERR(pdev) : 0; > + return PTR_RET(pdev); > } > omap_postcore_initcall(omap_gpmc_init); > > diff -u -p a/arch/arm/mach-omap2/pmu.c b/arch/arm/mach-omap2/pmu.c > --- a/arch/arm/mach-omap2/pmu.c > +++ b/arch/arm/mach-omap2/pmu.c > @@ -54,10 +54,7 @@ static int __init omap2_init_pmu(unsigne > WARN(IS_ERR(omap_pmu_dev), "Can't build omap_device for %s.\n", > dev_name); > > - if (IS_ERR(omap_pmu_dev)) > - return PTR_ERR(omap_pmu_dev); > - > - return 0; > + return PTR_RET(omap_pmu_dev); > } > > static int __init omap_init_pmu(void) > > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
* Kevin Hilman <khilman@linaro.org> [130603 14:23]: > Thomas Meyer <thomas@m3y3r.de> writes: > > > Signed-off-by: Thomas Meyer <thomas@m3y3r.de> > > Could use a changelog, but otherwise > > Acked-by: Kevin Hilman <khilman@linaro.org> I've updated the patch to use subject as the changelog, applying into omap-for-v3.11/fixes. Tony -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff -u -p a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c @@ -66,7 +66,7 @@ static int __init omap3_l3_init(void) WARN(IS_ERR(pdev), "could not build omap_device for %s\n", oh_name); - return IS_ERR(pdev) ? PTR_ERR(pdev) : 0; + return PTR_RET(pdev); } omap_postcore_initcall(omap3_l3_init); @@ -100,7 +100,7 @@ static int __init omap4_l3_init(void) WARN(IS_ERR(pdev), "could not build omap_device for %s\n", oh_name); - return IS_ERR(pdev) ? PTR_ERR(pdev) : 0; + return PTR_RET(pdev); } omap_postcore_initcall(omap4_l3_init); diff -u -p a/arch/arm/mach-omap2/fb.c b/arch/arm/mach-omap2/fb.c --- a/arch/arm/mach-omap2/fb.c +++ b/arch/arm/mach-omap2/fb.c @@ -83,10 +83,7 @@ static int __init omap_init_vrfb(void) pdev = platform_device_register_resndata(NULL, "omapvrfb", -1, res, num_res, NULL, 0); - if (IS_ERR(pdev)) - return PTR_ERR(pdev); - else - return 0; + return PTR_RET(pdev); } omap_arch_initcall(omap_init_vrfb); diff -u -p a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c --- a/arch/arm/mach-omap2/gpmc.c +++ b/arch/arm/mach-omap2/gpmc.c @@ -1678,7 +1678,7 @@ static int __init omap_gpmc_init(void) pdev = omap_device_build(DEVICE_NAME, -1, oh, NULL, 0); WARN(IS_ERR(pdev), "could not build omap_device for %s\n", oh_name); - return IS_ERR(pdev) ? PTR_ERR(pdev) : 0; + return PTR_RET(pdev); } omap_postcore_initcall(omap_gpmc_init); diff -u -p a/arch/arm/mach-omap2/pmu.c b/arch/arm/mach-omap2/pmu.c --- a/arch/arm/mach-omap2/pmu.c +++ b/arch/arm/mach-omap2/pmu.c @@ -54,10 +54,7 @@ static int __init omap2_init_pmu(unsigne WARN(IS_ERR(omap_pmu_dev), "Can't build omap_device for %s.\n", dev_name); - if (IS_ERR(omap_pmu_dev)) - return PTR_ERR(omap_pmu_dev); - - return 0; + return PTR_RET(omap_pmu_dev); } static int __init omap_init_pmu(void)
Signed-off-by: Thomas Meyer <thomas@m3y3r.de> --- -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html