]> git.karo-electronics.de Git - linux-beck.git/commitdiff
[media] s5c73m3: Remove __dev* attributes
authorSylwester Nawrocki <sylvester.nawrocki@gmail.com>
Wed, 6 Feb 2013 20:35:41 +0000 (17:35 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Thu, 7 Feb 2013 12:56:31 +0000 (10:56 -0200)
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>
drivers/media/i2c/s5c73m3/s5c73m3-core.c
drivers/media/i2c/s5c73m3/s5c73m3-spi.c

index c143c9ec7ba9e24a58643007c44babe97fac217a..5dbb65e1f6b7a2f70136ec35c86cca973a670dbb 100644 (file)
@@ -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;
@@ -1666,7 +1666,7 @@ out_err1:
        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);
@@ -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,
 };
 
index 889139c2ac5eadb9e00ae09d7e67940fa3a149cd..6f3a9c00fe6512092c0a4789671cc08144a54277 100644 (file)
@@ -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,
@@ -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;
 }
@@ -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;