samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

msm: camera: sensor: i2c driver remove call return value change

Browse Source 
Due to i2c driver remove call return value changed from int to void
from 6.1 kernel version.

CRs-Fixed: 3366233
Change-Id: I81713fdd65a53af37b0b9c573407587755bc1bae
Signed-off-by: Soumen Ghosh <quic_soumeng@quicinc.com>
This commit is contained in:
Soumen Ghosh
2022-12-21 11:43:55 -08:00
committed by Camera Software Integration
parent 96ff2ea80b
commit 57ba3a5181
7 changed files with 40 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/cam_sensor_module/cam_actuator/cam_actuator_dev.c
View File

@@ -334,12 +334,20 @@ static int32_t cam_actuator_driver_i2c_probe(struct i2c_client *client,
return rc;
}
#if KERNEL_VERSION(6, 1, 0) <= LINUX_VERSION_CODE
void cam_actuator_driver_i2c_remove(
struct i2c_client *client)
{
component_del(&client->dev, &cam_actuator_i2c_component_ops);
}
#else
static int32_t cam_actuator_driver_i2c_remove(
struct i2c_client *client)
{
component_del(&client->dev, &cam_actuator_i2c_component_ops);
return 0;
}
#endif
static int cam_actuator_platform_component_bind(struct device *dev,
struct device *master_dev, void *data)

7
drivers/cam_sensor_module/cam_eeprom/cam_eeprom_dev.c
View File

@@ -355,12 +355,19 @@ static int cam_eeprom_i2c_driver_probe(struct i2c_client *client,
return rc;
}
#if KERNEL_VERSION(6, 1, 0) <= LINUX_VERSION_CODE
void cam_eeprom_i2c_driver_remove(struct i2c_client *client)
{
component_del(&client->dev, &cam_eeprom_i2c_component_ops);
}
#else
static int cam_eeprom_i2c_driver_remove(struct i2c_client *client)
{
component_del(&client->dev, &cam_eeprom_i2c_component_ops);
return 0;
}
#endif
static int cam_eeprom_spi_setup(struct spi_device *spi)
{

8
drivers/cam_sensor_module/cam_flash/cam_flash_dev.c
View File

@@ -764,12 +764,20 @@ static int32_t cam_flash_i2c_driver_probe(struct i2c_client *client,
return rc;
}
#if KERNEL_VERSION(6, 1, 0) <= LINUX_VERSION_CODE
void cam_flash_i2c_driver_remove(struct i2c_client *client)
{
component_del(&client->dev, &cam_flash_i2c_component_ops);
}
#else
static int32_t cam_flash_i2c_driver_remove(struct i2c_client *client)
{
component_del(&client->dev, &cam_flash_i2c_component_ops);
return 0;
}
#endif
MODULE_DEVICE_TABLE(of, cam_flash_dt_match);

7
drivers/cam_sensor_module/cam_ois/cam_ois_dev.c
View File

@@ -324,12 +324,19 @@ static int cam_ois_i2c_driver_probe(struct i2c_client *client,
return rc;
}
#if KERNEL_VERSION(6, 1, 0) <= LINUX_VERSION_CODE
void cam_ois_i2c_driver_remove(struct i2c_client *client)
{
component_del(&client->dev, &cam_ois_i2c_component_ops);
}
#else
static int cam_ois_i2c_driver_remove(struct i2c_client *client)
{
component_del(&client->dev, &cam_ois_i2c_component_ops);
return 0;
}
#endif
static int cam_ois_component_bind(struct device *dev,
struct device *master_dev, void *data)

8
drivers/cam_sensor_module/cam_sensor/cam_sensor_dev.c
View File

@@ -377,12 +377,20 @@ static int cam_sensor_i2c_driver_probe(struct i2c_client *client,
return rc;
}
#if KERNEL_VERSION(6, 1, 0) <= LINUX_VERSION_CODE
void cam_sensor_i2c_driver_remove(struct i2c_client *client)
{
component_del(&client->dev, &cam_sensor_i2c_component_ops);
}
#else
static int cam_sensor_i2c_driver_remove(struct i2c_client *client)
{
component_del(&client->dev, &cam_sensor_i2c_component_ops);
return 0;
}
#endif
static int cam_sensor_component_bind(struct device *dev,
struct device *master_dev, void *data)