Skip to content

Commit

Permalink
[media] s5c73m3: Remove __dev* attributes
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Sylwester Nawrocki authored and Mauro Carvalho Chehab committed Feb 7, 2013
1 parent ddf289f commit c2668c0
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions drivers/media/i2c/s5c73m3/s5c73m3-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1561,8 +1561,8 @@ static int s5c73m3_configure_gpios(struct s5c73m3 *state,
return 0;
}

static int __devinit s5c73m3_probe(struct i2c_client *client,
const struct i2c_device_id *id)
static int s5c73m3_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct device *dev = &client->dev;
const struct s5c73m3_platform_data *pdata = client->dev.platform_data;
Expand Down Expand Up @@ -1666,7 +1666,7 @@ static int __devinit s5c73m3_probe(struct i2c_client *client,
return ret;
}

static int __devexit s5c73m3_remove(struct i2c_client *client)
static int s5c73m3_remove(struct i2c_client *client)
{
struct v4l2_subdev *sd = i2c_get_clientdata(client);
struct s5c73m3 *state = sensor_sd_to_s5c73m3(sd);
Expand All @@ -1693,7 +1693,7 @@ static struct i2c_driver s5c73m3_i2c_driver = {
.name = DRIVER_NAME,
},
.probe = s5c73m3_probe,
.remove = __devexit_p(s5c73m3_remove),
.remove = s5c73m3_remove,
.id_table = s5c73m3_id,
};

Expand Down
6 changes: 3 additions & 3 deletions drivers/media/i2c/s5c73m3/s5c73m3-spi.c
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ int s5c73m3_spi_read(struct s5c73m3 *state, void *addr,
return 0;
}

static int __devinit s5c73m3_spi_probe(struct spi_device *spi)
static int s5c73m3_spi_probe(struct spi_device *spi)
{
int r;
struct s5c73m3 *state = container_of(spi->dev.driver, struct s5c73m3,
Expand All @@ -132,7 +132,7 @@ static int __devinit s5c73m3_spi_probe(struct spi_device *spi)
return 0;
}

static int __devexit s5c73m3_spi_remove(struct spi_device *spi)
static int s5c73m3_spi_remove(struct spi_device *spi)
{
return 0;
}
Expand All @@ -141,7 +141,7 @@ int s5c73m3_register_spi_driver(struct s5c73m3 *state)
{
struct spi_driver *spidrv = &state->spidrv;

spidrv->remove = __devexit_p(s5c73m3_spi_remove);
spidrv->remove = s5c73m3_spi_remove;
spidrv->probe = s5c73m3_spi_probe;
spidrv->driver.name = S5C73M3_SPI_DRV_NAME;
spidrv->driver.bus = &spi_bus_type;
Expand Down

0 comments on commit c2668c0

Please sign in to comment.