---

yaml
---
r: 357513
b: refs/heads/master
c: c2668c0
h: refs/heads/master
i:
  357511: 91258e1
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ddf289f98b5ef664e4606205cf31d147eab76b18
+refs/heads/master: c2668c082ac1b4f30b145762a75ec2b3e016b952

trunk/drivers/media/i2c/s5c73m3/s5c73m3-core.c

@@ -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 @@ 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);
@@ -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,
 };
 

trunk/drivers/media/i2c/s5c73m3/s5c73m3-spi.c

@@ -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;