diff options
Diffstat (limited to 'drivers/media/platform/s5p-tv')
-rw-r--r-- | drivers/media/platform/s5p-tv/hdmi_drv.c | 6 | ||||
-rw-r--r-- | drivers/media/platform/s5p-tv/hdmiphy_drv.c | 8 | ||||
-rw-r--r-- | drivers/media/platform/s5p-tv/mixer.h | 2 | ||||
-rw-r--r-- | drivers/media/platform/s5p-tv/mixer_drv.c | 18 | ||||
-rw-r--r-- | drivers/media/platform/s5p-tv/mixer_video.c | 4 | ||||
-rw-r--r-- | drivers/media/platform/s5p-tv/sdo_drv.c | 6 | ||||
-rw-r--r-- | drivers/media/platform/s5p-tv/sii9234_drv.c | 8 |
7 files changed, 26 insertions, 26 deletions
diff --git a/drivers/media/platform/s5p-tv/hdmi_drv.c b/drivers/media/platform/s5p-tv/hdmi_drv.c index 8a9cf43018f..7c1116c73bf 100644 --- a/drivers/media/platform/s5p-tv/hdmi_drv.c +++ b/drivers/media/platform/s5p-tv/hdmi_drv.c | |||
@@ -830,7 +830,7 @@ fail: | |||
830 | return -ENODEV; | 830 | return -ENODEV; |
831 | } | 831 | } |
832 | 832 | ||
833 | static int __devinit hdmi_probe(struct platform_device *pdev) | 833 | static int hdmi_probe(struct platform_device *pdev) |
834 | { | 834 | { |
835 | struct device *dev = &pdev->dev; | 835 | struct device *dev = &pdev->dev; |
836 | struct resource *res; | 836 | struct resource *res; |
@@ -979,7 +979,7 @@ fail: | |||
979 | return ret; | 979 | return ret; |
980 | } | 980 | } |
981 | 981 | ||
982 | static int __devexit hdmi_remove(struct platform_device *pdev) | 982 | static int hdmi_remove(struct platform_device *pdev) |
983 | { | 983 | { |
984 | struct device *dev = &pdev->dev; | 984 | struct device *dev = &pdev->dev; |
985 | struct v4l2_subdev *sd = dev_get_drvdata(dev); | 985 | struct v4l2_subdev *sd = dev_get_drvdata(dev); |
@@ -997,7 +997,7 @@ static int __devexit hdmi_remove(struct platform_device *pdev) | |||
997 | 997 | ||
998 | static struct platform_driver hdmi_driver __refdata = { | 998 | static struct platform_driver hdmi_driver __refdata = { |
999 | .probe = hdmi_probe, | 999 | .probe = hdmi_probe, |
1000 | .remove = __devexit_p(hdmi_remove), | 1000 | .remove = hdmi_remove, |
1001 | .id_table = hdmi_driver_types, | 1001 | .id_table = hdmi_driver_types, |
1002 | .driver = { | 1002 | .driver = { |
1003 | .name = "s5p-hdmi", | 1003 | .name = "s5p-hdmi", |
diff --git a/drivers/media/platform/s5p-tv/hdmiphy_drv.c b/drivers/media/platform/s5p-tv/hdmiphy_drv.c index f67b3863180..06b5d2dbb2d 100644 --- a/drivers/media/platform/s5p-tv/hdmiphy_drv.c +++ b/drivers/media/platform/s5p-tv/hdmiphy_drv.c | |||
@@ -279,8 +279,8 @@ static const struct v4l2_subdev_ops hdmiphy_ops = { | |||
279 | .video = &hdmiphy_video_ops, | 279 | .video = &hdmiphy_video_ops, |
280 | }; | 280 | }; |
281 | 281 | ||
282 | static int __devinit hdmiphy_probe(struct i2c_client *client, | 282 | static int hdmiphy_probe(struct i2c_client *client, |
283 | const struct i2c_device_id *id) | 283 | const struct i2c_device_id *id) |
284 | { | 284 | { |
285 | struct hdmiphy_ctx *ctx; | 285 | struct hdmiphy_ctx *ctx; |
286 | 286 | ||
@@ -295,7 +295,7 @@ static int __devinit hdmiphy_probe(struct i2c_client *client, | |||
295 | return 0; | 295 | return 0; |
296 | } | 296 | } |
297 | 297 | ||
298 | static int __devexit hdmiphy_remove(struct i2c_client *client) | 298 | static int hdmiphy_remove(struct i2c_client *client) |
299 | { | 299 | { |
300 | struct v4l2_subdev *sd = i2c_get_clientdata(client); | 300 | struct v4l2_subdev *sd = i2c_get_clientdata(client); |
301 | struct hdmiphy_ctx *ctx = sd_to_ctx(sd); | 301 | struct hdmiphy_ctx *ctx = sd_to_ctx(sd); |
@@ -322,7 +322,7 @@ static struct i2c_driver hdmiphy_driver = { | |||
322 | .owner = THIS_MODULE, | 322 | .owner = THIS_MODULE, |
323 | }, | 323 | }, |
324 | .probe = hdmiphy_probe, | 324 | .probe = hdmiphy_probe, |
325 | .remove = __devexit_p(hdmiphy_remove), | 325 | .remove = hdmiphy_remove, |
326 | .id_table = hdmiphy_id, | 326 | .id_table = hdmiphy_id, |
327 | }; | 327 | }; |
328 | 328 | ||
diff --git a/drivers/media/platform/s5p-tv/mixer.h b/drivers/media/platform/s5p-tv/mixer.h index ddb422e2355..b671e20e931 100644 --- a/drivers/media/platform/s5p-tv/mixer.h +++ b/drivers/media/platform/s5p-tv/mixer.h | |||
@@ -290,7 +290,7 @@ static inline struct v4l2_subdev *to_outsd(struct mxr_device *mdev) | |||
290 | struct mxr_platform_data; | 290 | struct mxr_platform_data; |
291 | 291 | ||
292 | /** acquiring common video resources */ | 292 | /** acquiring common video resources */ |
293 | int __devinit mxr_acquire_video(struct mxr_device *mdev, | 293 | int mxr_acquire_video(struct mxr_device *mdev, |
294 | struct mxr_output_conf *output_cont, int output_count); | 294 | struct mxr_output_conf *output_cont, int output_count); |
295 | 295 | ||
296 | /** releasing common video resources */ | 296 | /** releasing common video resources */ |
diff --git a/drivers/media/platform/s5p-tv/mixer_drv.c b/drivers/media/platform/s5p-tv/mixer_drv.c index ca0f2971744..02faea03aa7 100644 --- a/drivers/media/platform/s5p-tv/mixer_drv.c +++ b/drivers/media/platform/s5p-tv/mixer_drv.c | |||
@@ -151,8 +151,8 @@ void mxr_power_put(struct mxr_device *mdev) | |||
151 | 151 | ||
152 | /* --------- RESOURCE MANAGEMENT -------------*/ | 152 | /* --------- RESOURCE MANAGEMENT -------------*/ |
153 | 153 | ||
154 | static int __devinit mxr_acquire_plat_resources(struct mxr_device *mdev, | 154 | static int mxr_acquire_plat_resources(struct mxr_device *mdev, |
155 | struct platform_device *pdev) | 155 | struct platform_device *pdev) |
156 | { | 156 | { |
157 | struct resource *res; | 157 | struct resource *res; |
158 | int ret; | 158 | int ret; |
@@ -271,8 +271,8 @@ fail: | |||
271 | return -ENODEV; | 271 | return -ENODEV; |
272 | } | 272 | } |
273 | 273 | ||
274 | static int __devinit mxr_acquire_resources(struct mxr_device *mdev, | 274 | static int mxr_acquire_resources(struct mxr_device *mdev, |
275 | struct platform_device *pdev) | 275 | struct platform_device *pdev) |
276 | { | 276 | { |
277 | int ret; | 277 | int ret; |
278 | ret = mxr_acquire_plat_resources(mdev, pdev); | 278 | ret = mxr_acquire_plat_resources(mdev, pdev); |
@@ -310,8 +310,8 @@ static void mxr_release_layers(struct mxr_device *mdev) | |||
310 | mxr_layer_release(mdev->layer[i]); | 310 | mxr_layer_release(mdev->layer[i]); |
311 | } | 311 | } |
312 | 312 | ||
313 | static int __devinit mxr_acquire_layers(struct mxr_device *mdev, | 313 | static int mxr_acquire_layers(struct mxr_device *mdev, |
314 | struct mxr_platform_data *pdata) | 314 | struct mxr_platform_data *pdata) |
315 | { | 315 | { |
316 | mdev->layer[0] = mxr_graph_layer_create(mdev, 0); | 316 | mdev->layer[0] = mxr_graph_layer_create(mdev, 0); |
317 | mdev->layer[1] = mxr_graph_layer_create(mdev, 1); | 317 | mdev->layer[1] = mxr_graph_layer_create(mdev, 1); |
@@ -372,7 +372,7 @@ static const struct dev_pm_ops mxr_pm_ops = { | |||
372 | 372 | ||
373 | /* --------- DRIVER INITIALIZATION ---------- */ | 373 | /* --------- DRIVER INITIALIZATION ---------- */ |
374 | 374 | ||
375 | static int __devinit mxr_probe(struct platform_device *pdev) | 375 | static int mxr_probe(struct platform_device *pdev) |
376 | { | 376 | { |
377 | struct device *dev = &pdev->dev; | 377 | struct device *dev = &pdev->dev; |
378 | struct mxr_platform_data *pdata = dev->platform_data; | 378 | struct mxr_platform_data *pdata = dev->platform_data; |
@@ -431,7 +431,7 @@ fail: | |||
431 | return ret; | 431 | return ret; |
432 | } | 432 | } |
433 | 433 | ||
434 | static int __devexit mxr_remove(struct platform_device *pdev) | 434 | static int mxr_remove(struct platform_device *pdev) |
435 | { | 435 | { |
436 | struct device *dev = &pdev->dev; | 436 | struct device *dev = &pdev->dev; |
437 | struct mxr_device *mdev = to_mdev(dev); | 437 | struct mxr_device *mdev = to_mdev(dev); |
@@ -450,7 +450,7 @@ static int __devexit mxr_remove(struct platform_device *pdev) | |||
450 | 450 | ||
451 | static struct platform_driver mxr_driver __refdata = { | 451 | static struct platform_driver mxr_driver __refdata = { |
452 | .probe = mxr_probe, | 452 | .probe = mxr_probe, |
453 | .remove = __devexit_p(mxr_remove), | 453 | .remove = mxr_remove, |
454 | .driver = { | 454 | .driver = { |
455 | .name = MXR_DRIVER_NAME, | 455 | .name = MXR_DRIVER_NAME, |
456 | .owner = THIS_MODULE, | 456 | .owner = THIS_MODULE, |
diff --git a/drivers/media/platform/s5p-tv/mixer_video.c b/drivers/media/platform/s5p-tv/mixer_video.c index 7379e77bf4e..1f3b7436511 100644 --- a/drivers/media/platform/s5p-tv/mixer_video.c +++ b/drivers/media/platform/s5p-tv/mixer_video.c | |||
@@ -62,8 +62,8 @@ done: | |||
62 | return sd; | 62 | return sd; |
63 | } | 63 | } |
64 | 64 | ||
65 | int __devinit mxr_acquire_video(struct mxr_device *mdev, | 65 | int mxr_acquire_video(struct mxr_device *mdev, |
66 | struct mxr_output_conf *output_conf, int output_count) | 66 | struct mxr_output_conf *output_conf, int output_count) |
67 | { | 67 | { |
68 | struct device *dev = mdev->dev; | 68 | struct device *dev = mdev->dev; |
69 | struct v4l2_device *v4l2_dev = &mdev->v4l2_dev; | 69 | struct v4l2_device *v4l2_dev = &mdev->v4l2_dev; |
diff --git a/drivers/media/platform/s5p-tv/sdo_drv.c b/drivers/media/platform/s5p-tv/sdo_drv.c index ad68bbed014..91a6939a270 100644 --- a/drivers/media/platform/s5p-tv/sdo_drv.c +++ b/drivers/media/platform/s5p-tv/sdo_drv.c | |||
@@ -292,7 +292,7 @@ static const struct dev_pm_ops sdo_pm_ops = { | |||
292 | .runtime_resume = sdo_runtime_resume, | 292 | .runtime_resume = sdo_runtime_resume, |
293 | }; | 293 | }; |
294 | 294 | ||
295 | static int __devinit sdo_probe(struct platform_device *pdev) | 295 | static int sdo_probe(struct platform_device *pdev) |
296 | { | 296 | { |
297 | struct device *dev = &pdev->dev; | 297 | struct device *dev = &pdev->dev; |
298 | struct sdo_device *sdev; | 298 | struct sdo_device *sdev; |
@@ -419,7 +419,7 @@ fail: | |||
419 | return ret; | 419 | return ret; |
420 | } | 420 | } |
421 | 421 | ||
422 | static int __devexit sdo_remove(struct platform_device *pdev) | 422 | static int sdo_remove(struct platform_device *pdev) |
423 | { | 423 | { |
424 | struct v4l2_subdev *sd = dev_get_drvdata(&pdev->dev); | 424 | struct v4l2_subdev *sd = dev_get_drvdata(&pdev->dev); |
425 | struct sdo_device *sdev = sd_to_sdev(sd); | 425 | struct sdo_device *sdev = sd_to_sdev(sd); |
@@ -437,7 +437,7 @@ static int __devexit sdo_remove(struct platform_device *pdev) | |||
437 | 437 | ||
438 | static struct platform_driver sdo_driver __refdata = { | 438 | static struct platform_driver sdo_driver __refdata = { |
439 | .probe = sdo_probe, | 439 | .probe = sdo_probe, |
440 | .remove = __devexit_p(sdo_remove), | 440 | .remove = sdo_remove, |
441 | .driver = { | 441 | .driver = { |
442 | .name = "s5p-sdo", | 442 | .name = "s5p-sdo", |
443 | .owner = THIS_MODULE, | 443 | .owner = THIS_MODULE, |
diff --git a/drivers/media/platform/s5p-tv/sii9234_drv.c b/drivers/media/platform/s5p-tv/sii9234_drv.c index 716d4846f8b..49191aac963 100644 --- a/drivers/media/platform/s5p-tv/sii9234_drv.c +++ b/drivers/media/platform/s5p-tv/sii9234_drv.c | |||
@@ -315,8 +315,8 @@ static const struct v4l2_subdev_ops sii9234_ops = { | |||
315 | .video = &sii9234_video_ops, | 315 | .video = &sii9234_video_ops, |
316 | }; | 316 | }; |
317 | 317 | ||
318 | static int __devinit sii9234_probe(struct i2c_client *client, | 318 | static int sii9234_probe(struct i2c_client *client, |
319 | const struct i2c_device_id *id) | 319 | const struct i2c_device_id *id) |
320 | { | 320 | { |
321 | struct device *dev = &client->dev; | 321 | struct device *dev = &client->dev; |
322 | struct sii9234_platform_data *pdata = dev->platform_data; | 322 | struct sii9234_platform_data *pdata = dev->platform_data; |
@@ -378,7 +378,7 @@ fail: | |||
378 | return ret; | 378 | return ret; |
379 | } | 379 | } |
380 | 380 | ||
381 | static int __devexit sii9234_remove(struct i2c_client *client) | 381 | static int sii9234_remove(struct i2c_client *client) |
382 | { | 382 | { |
383 | struct device *dev = &client->dev; | 383 | struct device *dev = &client->dev; |
384 | struct v4l2_subdev *sd = i2c_get_clientdata(client); | 384 | struct v4l2_subdev *sd = i2c_get_clientdata(client); |
@@ -406,7 +406,7 @@ static struct i2c_driver sii9234_driver = { | |||
406 | .pm = &sii9234_pm_ops, | 406 | .pm = &sii9234_pm_ops, |
407 | }, | 407 | }, |
408 | .probe = sii9234_probe, | 408 | .probe = sii9234_probe, |
409 | .remove = __devexit_p(sii9234_remove), | 409 | .remove = sii9234_remove, |
410 | .id_table = sii9234_id, | 410 | .id_table = sii9234_id, |
411 | }; | 411 | }; |
412 | 412 | ||