diff options
author | Sylwester Nawrocki <sylvester.nawrocki@gmail.com> | 2013-02-06 15:35:41 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-02-07 07:56:31 -0500 |
commit | c2668c082ac1b4f30b145762a75ec2b3e016b952 (patch) | |
tree | 68f2ac4ca5f20454450f527fe4032d8f9d1986e1 /drivers/media/i2c/s5c73m3 | |
parent | ddf289f98b5ef664e4606205cf31d147eab76b18 (diff) |
[media] s5c73m3: Remove __dev* attributes
Remove no longer supported __devinit, __devexit attributes.
Signed-off-by: Sylwester Nawrocki <sylvester.nawrocki@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/i2c/s5c73m3')
-rw-r--r-- | drivers/media/i2c/s5c73m3/s5c73m3-core.c | 8 | ||||
-rw-r--r-- | drivers/media/i2c/s5c73m3/s5c73m3-spi.c | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/drivers/media/i2c/s5c73m3/s5c73m3-core.c b/drivers/media/i2c/s5c73m3/s5c73m3-core.c index c143c9ec7ba9..5dbb65e1f6b7 100644 --- a/drivers/media/i2c/s5c73m3/s5c73m3-core.c +++ b/drivers/media/i2c/s5c73m3/s5c73m3-core.c | |||
@@ -1561,8 +1561,8 @@ static int s5c73m3_configure_gpios(struct s5c73m3 *state, | |||
1561 | return 0; | 1561 | return 0; |
1562 | } | 1562 | } |
1563 | 1563 | ||
1564 | static int __devinit s5c73m3_probe(struct i2c_client *client, | 1564 | static int s5c73m3_probe(struct i2c_client *client, |
1565 | const struct i2c_device_id *id) | 1565 | const struct i2c_device_id *id) |
1566 | { | 1566 | { |
1567 | struct device *dev = &client->dev; | 1567 | struct device *dev = &client->dev; |
1568 | const struct s5c73m3_platform_data *pdata = client->dev.platform_data; | 1568 | const struct s5c73m3_platform_data *pdata = client->dev.platform_data; |
@@ -1666,7 +1666,7 @@ out_err1: | |||
1666 | return ret; | 1666 | return ret; |
1667 | } | 1667 | } |
1668 | 1668 | ||
1669 | static int __devexit s5c73m3_remove(struct i2c_client *client) | 1669 | static int s5c73m3_remove(struct i2c_client *client) |
1670 | { | 1670 | { |
1671 | struct v4l2_subdev *sd = i2c_get_clientdata(client); | 1671 | struct v4l2_subdev *sd = i2c_get_clientdata(client); |
1672 | struct s5c73m3 *state = sensor_sd_to_s5c73m3(sd); | 1672 | struct s5c73m3 *state = sensor_sd_to_s5c73m3(sd); |
@@ -1693,7 +1693,7 @@ static struct i2c_driver s5c73m3_i2c_driver = { | |||
1693 | .name = DRIVER_NAME, | 1693 | .name = DRIVER_NAME, |
1694 | }, | 1694 | }, |
1695 | .probe = s5c73m3_probe, | 1695 | .probe = s5c73m3_probe, |
1696 | .remove = __devexit_p(s5c73m3_remove), | 1696 | .remove = s5c73m3_remove, |
1697 | .id_table = s5c73m3_id, | 1697 | .id_table = s5c73m3_id, |
1698 | }; | 1698 | }; |
1699 | 1699 | ||
diff --git a/drivers/media/i2c/s5c73m3/s5c73m3-spi.c b/drivers/media/i2c/s5c73m3/s5c73m3-spi.c index 889139c2ac5e..6f3a9c00fe65 100644 --- a/drivers/media/i2c/s5c73m3/s5c73m3-spi.c +++ b/drivers/media/i2c/s5c73m3/s5c73m3-spi.c | |||
@@ -111,7 +111,7 @@ int s5c73m3_spi_read(struct s5c73m3 *state, void *addr, | |||
111 | return 0; | 111 | return 0; |
112 | } | 112 | } |
113 | 113 | ||
114 | static int __devinit s5c73m3_spi_probe(struct spi_device *spi) | 114 | static int s5c73m3_spi_probe(struct spi_device *spi) |
115 | { | 115 | { |
116 | int r; | 116 | int r; |
117 | struct s5c73m3 *state = container_of(spi->dev.driver, struct s5c73m3, | 117 | struct s5c73m3 *state = container_of(spi->dev.driver, struct s5c73m3, |
@@ -132,7 +132,7 @@ static int __devinit s5c73m3_spi_probe(struct spi_device *spi) | |||
132 | return 0; | 132 | return 0; |
133 | } | 133 | } |
134 | 134 | ||
135 | static int __devexit s5c73m3_spi_remove(struct spi_device *spi) | 135 | static int s5c73m3_spi_remove(struct spi_device *spi) |
136 | { | 136 | { |
137 | return 0; | 137 | return 0; |
138 | } | 138 | } |
@@ -141,7 +141,7 @@ int s5c73m3_register_spi_driver(struct s5c73m3 *state) | |||
141 | { | 141 | { |
142 | struct spi_driver *spidrv = &state->spidrv; | 142 | struct spi_driver *spidrv = &state->spidrv; |
143 | 143 | ||
144 | spidrv->remove = __devexit_p(s5c73m3_spi_remove); | 144 | spidrv->remove = s5c73m3_spi_remove; |
145 | spidrv->probe = s5c73m3_spi_probe; | 145 | spidrv->probe = s5c73m3_spi_probe; |
146 | spidrv->driver.name = S5C73M3_SPI_DRV_NAME; | 146 | spidrv->driver.name = S5C73M3_SPI_DRV_NAME; |
147 | spidrv->driver.bus = &spi_bus_type; | 147 | spidrv->driver.bus = &spi_bus_type; |