Antonio Ospite wrote: > pxa_camera init() is going to be removed. > > Signed-off-by: Antonio Ospite <ospite@xxxxxxxxxxxxxxxxx> > --- > arch/arm/mach-pxa/em-x270.c | 9 +++++---- > 1 files changed, 5 insertions(+), 4 deletions(-) Acked-by: Mike Rapoport <mike@xxxxxxxxxxxxxx> > diff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c > index aec7f42..f71f34c 100644 > --- a/arch/arm/mach-pxa/em-x270.c > +++ b/arch/arm/mach-pxa/em-x270.c > @@ -967,7 +967,7 @@ static inline void em_x270_init_gpio_keys(void) {} > #if defined(CONFIG_VIDEO_PXA27x) || defined(CONFIG_VIDEO_PXA27x_MODULE) > static struct regulator *em_x270_camera_ldo; > > -static int em_x270_sensor_init(struct device *dev) > +static int em_x270_sensor_init(void) > { > int ret; > > @@ -996,7 +996,6 @@ static int em_x270_sensor_init(struct device *dev) > } > > struct pxacamera_platform_data em_x270_camera_platform_data = { > - .init = em_x270_sensor_init, > .flags = PXA_CAMERA_MASTER | PXA_CAMERA_DATAWIDTH_8 | > PXA_CAMERA_PCLK_EN | PXA_CAMERA_MCLK_EN, > .mclk_10khz = 2600, > @@ -1049,8 +1048,10 @@ static struct platform_device em_x270_camera = { > > static void __init em_x270_init_camera(void) > { > - pxa_set_camera_info(&em_x270_camera_platform_data); > - platform_device_register(&em_x270_camera); > + if (em_x270_sensor_init() == 0) { > + pxa_set_camera_info(&em_x270_camera_platform_data); > + platform_device_register(&em_x270_camera); > + } > } > #else > static inline void em_x270_init_camera(void) {} -- Sincerely yours, Mike. -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html