xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 3.8-rc5 into staging-next

Browse Source 
This resolves a merge issue with a iio driver, and the zram code.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman
2013-01-25 21:25:02 -08:00
parent c0cd2da16b 949db153b6
commit 8f5f90a872
1884 changed files with 18715 additions and 10347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/iio/light/adjd_s311.c
View File

@@ -286,8 +286,8 @@ static const struct iio_info adjd_s311_info = {
.driver_module = THIS_MODULE,
};
static int __devinit adjd_s311_probe(struct i2c_client *client,
const struct i2c_device_id *id)
static int adjd_s311_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct adjd_s311_data *data;
struct iio_dev *indio_dev;
@@ -330,7 +330,7 @@ exit:
return err;
}
static int __devexit adjd_s311_remove(struct i2c_client *client)
static int adjd_s311_remove(struct i2c_client *client)
{
struct iio_dev *indio_dev = i2c_get_clientdata(client);
struct adjd_s311_data *data = iio_priv(indio_dev);
@@ -354,7 +354,7 @@ static struct i2c_driver adjd_s311_driver = {
.name = ADJD_S311_DRV_NAME,
},
.probe = adjd_s311_probe,
.remove = __devexit_p(adjd_s311_remove),
.remove = adjd_s311_remove,
.id_table = adjd_s311_id,
};
module_i2c_driver(adjd_s311_driver);

4
drivers/iio/light/hid-sensor-als.c
View File

@@ -244,7 +244,7 @@ static int als_parse_report(struct platform_device *pdev,
}
/* Function to initialize the processing for usage id */
static int __devinit hid_als_probe(struct platform_device *pdev)
static int hid_als_probe(struct platform_device *pdev)
{
int ret = 0;
static const char *name = "als";
@@ -340,7 +340,7 @@ error_ret:
}
/* Function to deinitialize the processing for usage id */
static int __devinit hid_als_remove(struct platform_device *pdev)
static int hid_als_remove(struct platform_device *pdev)
{
struct hid_sensor_hub_device *hsdev = pdev->dev.platform_data;
struct iio_dev *indio_dev = platform_get_drvdata(pdev);

19
drivers/iio/light/lm3533-als.c
View File

@@ -718,8 +718,7 @@ static struct attribute_group lm3533_als_attribute_group = {
.attrs = lm3533_als_attributes
};
static int __devinit lm3533_als_set_input_mode(struct lm3533_als *als,
bool pwm_mode)
static int lm3533_als_set_input_mode(struct lm3533_als *als, bool pwm_mode)
{
u8 mask = LM3533_ALS_INPUT_MODE_MASK;
u8 val;
@@ -740,7 +739,7 @@ static int __devinit lm3533_als_set_input_mode(struct lm3533_als *als,
return 0;
}
static int __devinit lm3533_als_set_resistor(struct lm3533_als *als, u8 val)
static int lm3533_als_set_resistor(struct lm3533_als *als, u8 val)
{
int ret;
@@ -756,8 +755,8 @@ static int __devinit lm3533_als_set_resistor(struct lm3533_als *als, u8 val)
return 0;
}
static int __devinit lm3533_als_setup(struct lm3533_als *als,
struct lm3533_als_platform_data *pdata)
static int lm3533_als_setup(struct lm3533_als *als,
struct lm3533_als_platform_data *pdata)
{
int ret;
@@ -775,7 +774,7 @@ static int __devinit lm3533_als_setup(struct lm3533_als *als,
return 0;
}
static int __devinit lm3533_als_setup_irq(struct lm3533_als *als, void *dev)
static int lm3533_als_setup_irq(struct lm3533_als *als, void *dev)
{
u8 mask = LM3533_ALS_INT_ENABLE_MASK;
int ret;
@@ -799,7 +798,7 @@ static int __devinit lm3533_als_setup_irq(struct lm3533_als *als, void *dev)
return 0;
}
static int __devinit lm3533_als_enable(struct lm3533_als *als)
static int lm3533_als_enable(struct lm3533_als *als)
{
u8 mask = LM3533_ALS_ENABLE_MASK;
int ret;
@@ -830,7 +829,7 @@ static const struct iio_info lm3533_als_info = {
.read_raw = &lm3533_als_read_raw,
};
static int __devinit lm3533_als_probe(struct platform_device *pdev)
static int lm3533_als_probe(struct platform_device *pdev)
{
struct lm3533 *lm3533;
struct lm3533_als_platform_data *pdata;
@@ -901,7 +900,7 @@ err_free_dev:
return ret;
}
static int __devexit lm3533_als_remove(struct platform_device *pdev)
static int lm3533_als_remove(struct platform_device *pdev)
{
struct iio_dev *indio_dev = platform_get_drvdata(pdev);
struct lm3533_als *als = iio_priv(indio_dev);
@@ -922,7 +921,7 @@ static struct platform_driver lm3533_als_driver = {
.owner = THIS_MODULE,
},
.probe = lm3533_als_probe,
.remove = __devexit_p(lm3533_als_remove),
.remove = lm3533_als_remove,
};
module_platform_driver(lm3533_als_driver);

8
drivers/iio/light/vcnl4000.c
View File

@@ -150,8 +150,8 @@ static const struct iio_info vcnl4000_info = {
.driver_module = THIS_MODULE,
};
static int __devinit vcnl4000_probe(struct i2c_client *client,
const struct i2c_device_id *id)
static int vcnl4000_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct vcnl4000_data *data;
struct iio_dev *indio_dev;
@@ -190,7 +190,7 @@ error_free_dev:
return ret;
}
static int __devexit vcnl4000_remove(struct i2c_client *client)
static int vcnl4000_remove(struct i2c_client *client)
{
struct iio_dev *indio_dev = i2c_get_clientdata(client);
@@ -206,7 +206,7 @@ static struct i2c_driver vcnl4000_driver = {
.owner = THIS_MODULE,
},
.probe = vcnl4000_probe,
.remove = __devexit_p(vcnl4000_remove),
.remove = vcnl4000_remove,
.id_table = vcnl4000_id,
};