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

Commit 0fe763c5 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Drivers: misc: 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, __devinitdata,
__devinitconst, 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>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8d85fce7

drivers/auxdisplay/cfag12864bfb.c

+5 −5
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 


#define CFAG12864BFB_NAME "cfag12864bfb"



static struct fb_fix_screeninfo cfag12864bfb_fix __devinitdata = {

static struct fb_fix_screeninfo cfag12864bfb_fix = {

	.id = "cfag12864b",

	.type = FB_TYPE_PACKED_PIXELS,

	.visual = FB_VISUAL_MONO10,
@@ -48,7 +48,7 @@ static struct fb_fix_screeninfo cfag12864bfb_fix __devinitdata = { 
	.accel = FB_ACCEL_NONE,

};



static struct fb_var_screeninfo cfag12864bfb_var __devinitdata = {

static struct fb_var_screeninfo cfag12864bfb_var = {

	.xres = CFAG12864B_WIDTH,

	.yres = CFAG12864B_HEIGHT,

	.xres_virtual = CFAG12864B_WIDTH,
@@ -80,7 +80,7 @@ static struct fb_ops cfag12864bfb_ops = { 
	.fb_mmap = cfag12864bfb_mmap,

};



static int __devinit cfag12864bfb_probe(struct platform_device *device)

static int cfag12864bfb_probe(struct platform_device *device)

{

	int ret = -EINVAL;

 	struct fb_info *info = framebuffer_alloc(0, &device->dev);
@@ -114,7 +114,7 @@ none: 
	return ret;

}



static int __devexit cfag12864bfb_remove(struct platform_device *device)

static int cfag12864bfb_remove(struct platform_device *device)

{

	struct fb_info *info = platform_get_drvdata(device);
@@ -128,7 +128,7 @@ static int __devexit cfag12864bfb_remove(struct platform_device *device) 


static struct platform_driver cfag12864bfb_driver = {

	.probe	= cfag12864bfb_probe,

	.remove = __devexit_p(cfag12864bfb_remove),

	.remove = cfag12864bfb_remove,

	.driver = {

		.name	= CFAG12864BFB_NAME,

	},

drivers/bus/omap-ocp2scp.c

+3 −3
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ static int ocp2scp_remove_devices(struct device *dev, void *c) 
	return 0;

}



static int __devinit omap_ocp2scp_probe(struct platform_device *pdev)

static int omap_ocp2scp_probe(struct platform_device *pdev)

{

	int ret;

	unsigned res_cnt, i;
@@ -116,7 +116,7 @@ err0: 
	return ret;

}



static int __devexit omap_ocp2scp_remove(struct platform_device *pdev)

static int omap_ocp2scp_remove(struct platform_device *pdev)

{

	pm_runtime_disable(&pdev->dev);

	device_for_each_child(&pdev->dev, NULL, ocp2scp_remove_devices);
@@ -134,7 +134,7 @@ MODULE_DEVICE_TABLE(of, omap_ocp2scp_id_table); 


static struct platform_driver omap_ocp2scp_driver = {

	.probe		= omap_ocp2scp_probe,

	.remove		= __devexit_p(omap_ocp2scp_remove),

	.remove		= omap_ocp2scp_remove,

	.driver		= {

		.name	= "omap-ocp2scp",

		.owner	= THIS_MODULE,

drivers/bus/omap_l3_noc.c

+3 −3
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ static irqreturn_t l3_interrupt_handler(int irq, void *_l3) 
	return IRQ_HANDLED;

}



static int __devinit omap4_l3_probe(struct platform_device *pdev)

static int omap4_l3_probe(struct platform_device *pdev)

{

	static struct omap4_l3 *l3;

	struct resource	*res;
@@ -219,7 +219,7 @@ err0: 
	return ret;

}



static int __devexit omap4_l3_remove(struct platform_device *pdev)

static int omap4_l3_remove(struct platform_device *pdev)

{

	struct omap4_l3 *l3 = platform_get_drvdata(pdev);
@@ -245,7 +245,7 @@ MODULE_DEVICE_TABLE(of, l3_noc_match); 


static struct platform_driver omap4_l3_driver = {

	.probe		= omap4_l3_probe,

	.remove		= __devexit_p(omap4_l3_remove),

	.remove		= omap4_l3_remove,

	.driver		= {

		.name		= "omap_l3_noc",

		.owner		= THIS_MODULE,

drivers/cdrom/gdrom.c

+9 −9
Original line number Diff line number Diff line
@@ -557,7 +557,7 @@ static irqreturn_t gdrom_dma_interrupt(int irq, void *dev_id) 
	return IRQ_HANDLED;

}



static int __devinit gdrom_set_interrupt_handlers(void)

static int gdrom_set_interrupt_handlers(void)

{

	int err;
@@ -681,7 +681,7 @@ static void gdrom_request(struct request_queue *rq) 
}



/* Print string identifying GD ROM device */

static int __devinit gdrom_outputversion(void)

static int gdrom_outputversion(void)

{

	struct gdrom_id *id;

	char *model_name, *manuf_name, *firmw_ver;
@@ -715,7 +715,7 @@ free_id: 
}



/* set the default mode for DMA transfer */

static int __devinit gdrom_init_dma_mode(void)

static int gdrom_init_dma_mode(void)

{

	__raw_writeb(0x13, GDROM_ERROR_REG);

	__raw_writeb(0x22, GDROM_INTSEC_REG);
@@ -736,7 +736,7 @@ static int __devinit gdrom_init_dma_mode(void) 
	return 0;

}



static void __devinit probe_gdrom_setupcd(void)

static void probe_gdrom_setupcd(void)

{

	gd.cd_info->ops = &gdrom_ops;

	gd.cd_info->capacity = 1;
@@ -745,7 +745,7 @@ static void __devinit probe_gdrom_setupcd(void) 
		CDC_SELECT_DISC;

}



static void __devinit probe_gdrom_setupdisk(void)

static void probe_gdrom_setupdisk(void)

{

	gd.disk->major = gdrom_major;

	gd.disk->first_minor = 1;
@@ -753,7 +753,7 @@ static void __devinit probe_gdrom_setupdisk(void) 
	strcpy(gd.disk->disk_name, GDROM_DEV_NAME);

}



static int __devinit probe_gdrom_setupqueue(void)

static int probe_gdrom_setupqueue(void)

{

	blk_queue_logical_block_size(gd.gdrom_rq, GDROM_HARD_SECTOR);

	/* using DMA so memory will need to be contiguous */
@@ -768,7 +768,7 @@ static int __devinit probe_gdrom_setupqueue(void) 
 * register this as a block device and as compliant with the

 * universal CD Rom driver interface

 */

static int __devinit probe_gdrom(struct platform_device *devptr)

static int probe_gdrom(struct platform_device *devptr)

{

	int err;

	/* Start the device */
@@ -838,7 +838,7 @@ probe_fail_no_mem: 
	return err;

}



static int __devexit remove_gdrom(struct platform_device *devptr)

static int remove_gdrom(struct platform_device *devptr)

{

	flush_work(&work);

	blk_cleanup_queue(gd.gdrom_rq);
@@ -854,7 +854,7 @@ static int __devexit remove_gdrom(struct platform_device *devptr) 


static struct platform_driver gdrom_driver = {

	.probe = probe_gdrom,

	.remove = __devexit_p(remove_gdrom),

	.remove = remove_gdrom,

	.driver = {

			.name = GDROM_DEV_NAME,

	},

drivers/clk/clk-twl6040.c

+3 −3
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ static struct clk_init_data wm831x_clkout_init = { 
	.flags = CLK_IS_ROOT,

};



static int __devinit twl6040_clk_probe(struct platform_device *pdev)

static int twl6040_clk_probe(struct platform_device *pdev)

{

	struct twl6040 *twl6040 = dev_get_drvdata(pdev->dev.parent);

	struct twl6040_clk *clkdata;
@@ -100,7 +100,7 @@ static int __devinit twl6040_clk_probe(struct platform_device *pdev) 
	return 0;

}



static int __devexit twl6040_clk_remove(struct platform_device *pdev)

static int twl6040_clk_remove(struct platform_device *pdev)

{

	struct twl6040_clk *clkdata = dev_get_drvdata(&pdev->dev);
@@ -115,7 +115,7 @@ static struct platform_driver twl6040_clk_driver = { 
		.owner = THIS_MODULE,

	},

	.probe = twl6040_clk_probe,

	.remove = __devexit_p(twl6040_clk_remove),

	.remove = twl6040_clk_remove,

};



module_platform_driver(twl6040_clk_driver);