Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56550d94 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Drivers: gpu: remove __dev* attributes. 



CONFIG_HOTPLUG is going away as an option.  As a result, the __dev*
markings need to be removed.

This change removes the use of __devinit, __devexit_p, and __devexit
from these drivers.

Based on patches originally written by Bill Pemberton, but redone by me
in order to handle some of the coding style issues better, by hand.

Cc: Bill Pemberton <wfp5p@virginia.edu>
Cc: David Airlie <airlied@linux.ie>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1e6d9abe

drivers/gpu/drm/ast/ast_drv.c

+1 −2
Original line number Diff line number Diff line
@@ -60,8 +60,7 @@ static DEFINE_PCI_DEVICE_TABLE(pciidlist) = { 


MODULE_DEVICE_TABLE(pci, pciidlist);



static int __devinit

ast_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

static int ast_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

{

	return drm_get_pci_dev(pdev, ent, &driver);

}

drivers/gpu/drm/cirrus/cirrus_drv.c

+2 −2
Original line number Diff line number Diff line
@@ -56,8 +56,8 @@ static int cirrus_kick_out_firmware_fb(struct pci_dev *pdev) 
	return 0;

}



static int __devinit

cirrus_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

static int cirrus_pci_probe(struct pci_dev *pdev,

			    const struct pci_device_id *ent)

{

	int ret;

drivers/gpu/drm/exynos/exynos_ddc.c

+1 −1
Original line number Diff line number Diff line
@@ -66,6 +66,6 @@ struct i2c_driver ddc_driver = { 
	},

	.id_table	= ddc_idtable,

	.probe		= s5p_ddc_probe,

	.remove		= __devexit_p(s5p_ddc_remove),

	.remove		= s5p_ddc_remove,

	.command		= NULL,

};

drivers/gpu/drm/exynos/exynos_drm_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -325,7 +325,7 @@ static int exynos_drm_platform_remove(struct platform_device *pdev) 


static struct platform_driver exynos_drm_platform_driver = {

	.probe		= exynos_drm_platform_probe,

	.remove		= __devexit_p(exynos_drm_platform_remove),

	.remove		= exynos_drm_platform_remove,

	.driver		= {

		.owner	= THIS_MODULE,

		.name	= "exynos-drm",

drivers/gpu/drm/exynos/exynos_drm_fimc.c

+3 −3
Original line number Diff line number Diff line
@@ -1714,7 +1714,7 @@ static void fimc_ippdrv_stop(struct device *dev, enum drm_exynos_ipp_cmd cmd) 
	fimc_write(cfg, EXYNOS_CIGCTRL);

}



static int __devinit fimc_probe(struct platform_device *pdev)

static int fimc_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct fimc_context *ctx;
@@ -1891,7 +1891,7 @@ static int __devinit fimc_probe(struct platform_device *pdev) 
	return ret;

}



static int __devexit fimc_remove(struct platform_device *pdev)

static int fimc_remove(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct fimc_context *ctx = get_fimc_context(dev);
@@ -1990,7 +1990,7 @@ static const struct dev_pm_ops fimc_pm_ops = { 


struct platform_driver fimc_driver = {

	.probe		= fimc_probe,

	.remove		= __devexit_p(fimc_remove),

	.remove		= fimc_remove,

	.id_table	= fimc_driver_ids,

	.driver		= {

		.name	= "exynos-drm-fimc",