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

Commit 4c62e976 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Drivers: media: 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>
Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c571b211

drivers/media/i2c/adv7180.c

+4 −4
Original line number Diff line number Diff line
@@ -540,7 +540,7 @@ static int init_device(struct i2c_client *client, struct adv7180_state *state) 
	return 0;

}



static __devinit int adv7180_probe(struct i2c_client *client,

static int adv7180_probe(struct i2c_client *client,

			 const struct i2c_device_id *id)

{

	struct adv7180_state *state;
@@ -587,7 +587,7 @@ static __devinit int adv7180_probe(struct i2c_client *client, 
	return ret;

}



static __devexit int adv7180_remove(struct i2c_client *client)

static int adv7180_remove(struct i2c_client *client)

{

	struct v4l2_subdev *sd = i2c_get_clientdata(client);

	struct adv7180_state *state = to_state(sd);
@@ -652,7 +652,7 @@ static struct i2c_driver adv7180_driver = { 
		   .name = KBUILD_MODNAME,

		   },

	.probe = adv7180_probe,

	.remove = __devexit_p(adv7180_remove),

	.remove = adv7180_remove,

#ifdef CONFIG_PM

	.suspend = adv7180_suspend,

	.resume = adv7180_resume,

drivers/media/i2c/adv7183.c

+1 −1
Original line number Diff line number Diff line
@@ -677,7 +677,7 @@ static struct i2c_driver adv7183_driver = { 
		.name   = "adv7183",

	},

	.probe          = adv7183_probe,

	.remove         = __devexit_p(adv7183_remove),

	.remove         = adv7183_remove,

	.id_table       = adv7183_id,

};

drivers/media/i2c/as3645a.c

+5 −5
Original line number Diff line number Diff line
@@ -713,7 +713,7 @@ static int as3645a_resume(struct device *dev) 
 * The number of LEDs reported in platform data is used to compute default

 * limits. Parameters passed through platform data can override those limits.

 */

static int __devinit as3645a_init_controls(struct as3645a *flash)

static int as3645a_init_controls(struct as3645a *flash)

{

	const struct as3645a_platform_data *pdata = flash->pdata;

	struct v4l2_ctrl *ctrl;
@@ -804,7 +804,7 @@ static int __devinit as3645a_init_controls(struct as3645a *flash) 
	return flash->ctrls.error;

}



static int __devinit as3645a_probe(struct i2c_client *client,

static int as3645a_probe(struct i2c_client *client,

			 const struct i2c_device_id *devid)

{

	struct as3645a *flash;
@@ -846,7 +846,7 @@ static int __devinit as3645a_probe(struct i2c_client *client, 
	return ret;

}



static int __devexit as3645a_remove(struct i2c_client *client)

static int as3645a_remove(struct i2c_client *client)

{

	struct v4l2_subdev *subdev = i2c_get_clientdata(client);

	struct as3645a *flash = to_as3645a(subdev);
@@ -877,7 +877,7 @@ static struct i2c_driver as3645a_i2c_driver = { 
		.pm   = &as3645a_pm_ops,

	},

	.probe	= as3645a_probe,

	.remove	= __devexit_p(as3645a_remove),

	.remove	= as3645a_remove,

	.id_table = as3645a_id_table,

};

drivers/media/i2c/m5mols/m5mols_core.c

+4 −4
Original line number Diff line number Diff line
@@ -926,7 +926,7 @@ static irqreturn_t m5mols_irq_handler(int irq, void *data) 
	return IRQ_HANDLED;

}



static int __devinit m5mols_probe(struct i2c_client *client,

static int m5mols_probe(struct i2c_client *client,

			const struct i2c_device_id *id)

{

	const struct m5mols_platform_data *pdata = client->dev.platform_data;
@@ -1018,7 +1018,7 @@ static int __devinit m5mols_probe(struct i2c_client *client, 
	return ret;

}



static int __devexit m5mols_remove(struct i2c_client *client)

static int m5mols_remove(struct i2c_client *client)

{

	struct v4l2_subdev *sd = i2c_get_clientdata(client);

	struct m5mols_info *info = to_m5mols(sd);
@@ -1045,7 +1045,7 @@ static struct i2c_driver m5mols_i2c_driver = { 
		.name	= MODULE_NAME,

	},

	.probe		= m5mols_probe,

	.remove		= __devexit_p(m5mols_remove),

	.remove		= m5mols_remove,

	.id_table	= m5mols_id,

};

drivers/media/i2c/vs6624.c

+3 −3
Original line number Diff line number Diff line
@@ -788,7 +788,7 @@ static const struct v4l2_subdev_ops vs6624_ops = { 
	.video = &vs6624_video_ops,

};



static int __devinit vs6624_probe(struct i2c_client *client,

static int vs6624_probe(struct i2c_client *client,

			const struct i2c_device_id *id)

{

	struct vs6624 *sensor;
@@ -881,7 +881,7 @@ static int __devinit vs6624_probe(struct i2c_client *client, 
	return ret;

}



static int __devexit vs6624_remove(struct i2c_client *client)

static int vs6624_remove(struct i2c_client *client)

{

	struct v4l2_subdev *sd = i2c_get_clientdata(client);

	struct vs6624 *sensor = to_vs6624(sd);
@@ -906,7 +906,7 @@ static struct i2c_driver vs6624_driver = { 
		.name   = "vs6624",

	},

	.probe          = vs6624_probe,

	.remove         = __devexit_p(vs6624_remove),

	.remove         = vs6624_remove,

	.id_table       = vs6624_id,

};