From 99c28f10913018e4dae5db1a571120237a97e951 Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 19 Nov 2012 13:20:51 -0500 Subject: [PATCH] staging: drm/imx: remove use of __devexit_p CONFIG_HOTPLUG is going away as an option so __devexit_p is no longer needed. Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman --- drivers/staging/imx-drm/imx-drm-core.c | 2 +- drivers/staging/imx-drm/ipu-v3/ipu-common.c | 2 +- drivers/staging/imx-drm/ipuv3-crtc.c | 2 +- drivers/staging/imx-drm/parallel-display.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/imx-drm/imx-drm-core.c b/drivers/staging/imx-drm/imx-drm-core.c index 1913199ba16e..ecf0f44bc70e 100644 --- a/drivers/staging/imx-drm/imx-drm-core.c +++ b/drivers/staging/imx-drm/imx-drm-core.c @@ -824,7 +824,7 @@ static int imx_drm_platform_remove(struct platform_device *pdev) static struct platform_driver imx_drm_pdrv = { .probe = imx_drm_platform_probe, - .remove = __devexit_p(imx_drm_platform_remove), + .remove = imx_drm_platform_remove, .driver = { .owner = THIS_MODULE, .name = "imx-drm", diff --git a/drivers/staging/imx-drm/ipu-v3/ipu-common.c b/drivers/staging/imx-drm/ipu-v3/ipu-common.c index cd05718b7044..937c0b61b318 100644 --- a/drivers/staging/imx-drm/ipu-v3/ipu-common.c +++ b/drivers/staging/imx-drm/ipu-v3/ipu-common.c @@ -1158,7 +1158,7 @@ static struct platform_driver imx_ipu_driver = { .of_match_table = imx_ipu_dt_ids, }, .probe = ipu_probe, - .remove = __devexit_p(ipu_remove), + .remove = ipu_remove, }; module_platform_driver(imx_ipu_driver); diff --git a/drivers/staging/imx-drm/ipuv3-crtc.c b/drivers/staging/imx-drm/ipuv3-crtc.c index 7e85c5972ae8..33c82fb961e9 100644 --- a/drivers/staging/imx-drm/ipuv3-crtc.c +++ b/drivers/staging/imx-drm/ipuv3-crtc.c @@ -570,7 +570,7 @@ static struct platform_driver ipu_drm_driver = { .name = "imx-ipuv3-crtc", }, .probe = ipu_drm_probe, - .remove = __devexit_p(ipu_drm_remove), + .remove = ipu_drm_remove, }; module_platform_driver(ipu_drm_driver); diff --git a/drivers/staging/imx-drm/parallel-display.c b/drivers/staging/imx-drm/parallel-display.c index 324283c95530..ba53778e2f0c 100644 --- a/drivers/staging/imx-drm/parallel-display.c +++ b/drivers/staging/imx-drm/parallel-display.c @@ -256,7 +256,7 @@ static const struct of_device_id imx_pd_dt_ids[] = { static struct platform_driver imx_pd_driver = { .probe = imx_pd_probe, - .remove = __devexit_p(imx_pd_remove), + .remove = imx_pd_remove, .driver = { .of_match_table = imx_pd_dt_ids, .name = "imx-parallel-display", -- 2.20.1