Skip to content

Commit

Permalink
Merge pull request #98 from mnakai3/ubuntu23.10
Browse files Browse the repository at this point in the history
modified the kernel version appropriately to make it compatible with ubuntu23.10 (kernel 6.5)
  • Loading branch information
bigbearishappy committed Mar 28, 2024
2 parents 0683cd4 + 4876ef2 commit 3b9076d
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion modules/bq24179_charger/bq25790_charger.c
Original file line number Diff line number Diff line change
Expand Up @@ -1104,7 +1104,7 @@ static int bq25790_parse_dt(struct bq25790_device *bq)
return 0;
}

#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 6, 20)
#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0)
static int bq25790_probe(struct i2c_client *client)
#else
static int bq25790_probe(struct i2c_client *client,
Expand Down
2 changes: 1 addition & 1 deletion modules/lis3lv02d/lis3lv02d_i2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ static const struct of_device_id lis3lv02d_i2c_dt_ids[] = {
MODULE_DEVICE_TABLE(of, lis3lv02d_i2c_dt_ids);
#endif

#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 6, 20)
#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0)
static int lis3lv02d_i2c_probe(struct i2c_client *client)
#else
static int lis3lv02d_i2c_probe(struct i2c_client *client,
Expand Down
4 changes: 2 additions & 2 deletions modules/ltr30x/ltr30x.c
Original file line number Diff line number Diff line change
Expand Up @@ -1413,14 +1413,14 @@ static const char *ltr501_match_acpi_device(struct device *dev, int *chip_idx)
return dev_name(dev);
}

#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 6, 20)
#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0)
static int ltr501_probe(struct i2c_client *client)
#else
static int ltr501_probe(struct i2c_client *client,
const struct i2c_device_id *id)
#endif
{
#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 6, 20)
#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0)
const struct i2c_device_id *id = i2c_client_get_device_id(client);
#endif
struct ltr501_data *data;
Expand Down
4 changes: 2 additions & 2 deletions modules/mipi_dsi/mipi_dsi_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ static int backlight_init(struct i2c_mipi_dsi *md)


// I2C driver
#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 6, 20)
#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0)
static int i2c_md_probe(struct i2c_client *i2c)
#else
static int i2c_md_probe(struct i2c_client *i2c, const struct i2c_device_id *id)
Expand Down Expand Up @@ -379,7 +379,7 @@ static int i2c_md_probe(struct i2c_client *i2c, const struct i2c_device_id *id)

DBG_FUNC("Add panel");
md->panel_data->set_dsi(md->dsi);
#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 6, 20)
#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0)
md->panel.prepare_prev_first = true;
#elif LINUX_VERSION_CODE >= KERNEL_VERSION(5, 15, 0)
md->panel.prepare_upstream_first = true;
Expand Down

0 comments on commit 3b9076d

Please sign in to comment.