diff options
Diffstat (limited to 'arch/sh')
-rw-r--r-- | arch/sh/boards/mach-ap325rxa/setup.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/arch/sh/boards/mach-ap325rxa/setup.c b/arch/sh/boards/mach-ap325rxa/setup.c index 969421f64a15..e57b1df6da6a 100644 --- a/arch/sh/boards/mach-ap325rxa/setup.c +++ b/arch/sh/boards/mach-ap325rxa/setup.c | |||
@@ -332,8 +332,8 @@ static int camera_set_capture(struct soc_camera_platform_info *info, | |||
332 | return ret; | 332 | return ret; |
333 | } | 333 | } |
334 | 334 | ||
335 | static int ap325rxa_camera_add(struct soc_camera_link *icl, struct device *dev); | 335 | static int ap325rxa_camera_add(struct soc_camera_device *icd); |
336 | static void ap325rxa_camera_del(struct soc_camera_link *icl); | 336 | static void ap325rxa_camera_del(struct soc_camera_device *icd); |
337 | 337 | ||
338 | static struct soc_camera_platform_info camera_info = { | 338 | static struct soc_camera_platform_info camera_info = { |
339 | .format_name = "UYVY", | 339 | .format_name = "UYVY", |
@@ -366,24 +366,23 @@ static void ap325rxa_camera_release(struct device *dev) | |||
366 | soc_camera_platform_release(&camera_device); | 366 | soc_camera_platform_release(&camera_device); |
367 | } | 367 | } |
368 | 368 | ||
369 | static int ap325rxa_camera_add(struct soc_camera_link *icl, | 369 | static int ap325rxa_camera_add(struct soc_camera_device *icd) |
370 | struct device *dev) | ||
371 | { | 370 | { |
372 | int ret = soc_camera_platform_add(icl, dev, &camera_device, &camera_link, | 371 | int ret = soc_camera_platform_add(icd, &camera_device, &camera_link, |
373 | ap325rxa_camera_release, 0); | 372 | ap325rxa_camera_release, 0); |
374 | if (ret < 0) | 373 | if (ret < 0) |
375 | return ret; | 374 | return ret; |
376 | 375 | ||
377 | ret = camera_probe(); | 376 | ret = camera_probe(); |
378 | if (ret < 0) | 377 | if (ret < 0) |
379 | soc_camera_platform_del(icl, camera_device, &camera_link); | 378 | soc_camera_platform_del(icd, camera_device, &camera_link); |
380 | 379 | ||
381 | return ret; | 380 | return ret; |
382 | } | 381 | } |
383 | 382 | ||
384 | static void ap325rxa_camera_del(struct soc_camera_link *icl) | 383 | static void ap325rxa_camera_del(struct soc_camera_device *icd) |
385 | { | 384 | { |
386 | soc_camera_platform_del(icl, camera_device, &camera_link); | 385 | soc_camera_platform_del(icd, camera_device, &camera_link); |
387 | } | 386 | } |
388 | #endif /* CONFIG_I2C */ | 387 | #endif /* CONFIG_I2C */ |
389 | 388 | ||