iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update extcon next for v6.2

Browse Source 
Detailed description for this pull request:
 - Replace irqchip mask_invert with unmask_base
   to remove deprecated mask_invert flag for extcon-max77843.c
 
 - Convert to i2c's .probe_new style for extcon-fsa9480,
   extcon-rt8973 and extcon-usbc-uusb320.c
 -----BEGIN PGP SIGNATURE-----
 
 iQJKBAABCgA0FiEEsSpuqBtbWtRe4rLGnM3fLN7rz1MFAmOK59UWHGN3MDAuY2hv
 aUBzYW1zdW5nLmNvbQAKCRCczd8s3uvPU60DEAC5QG5OevfT1y6M9sKV/L9Yifq3
 w269BGL5huptiLHUsvTJPsUMWIaq8haEEAyQWJqA2wetTuQXluYPy9QZlnmHV8n1
 uxXB9Hsd8tKnXpSsXSrv5Cr/AY7HPUqKy3kFdbeyB2dYPYK1mVI1SpislaJob4It
 AVTa8Vdju17KCIbzKdEIPzaRe+I8riuEpR8YqitiwH65lofXr+hEULJ8XJ5ZEzcg
 15YRzjE1AxO67+xw3S6+cUnCteaYEBSxEKFxlPZvOC+kcqHDoET3t4sLJDhizmA8
 yevEDhvDhRFkai7GqUVV1G+ib6DMFJmqlgcVcGtZmbvhmv7Ki2CkJzpc5eptmfbe
 6LGoRb/0rVll+31Hdp2n0//wOT6T+31aUvOw2cUIWV4sS+G87MAOV4ENgg3U8w4Z
 a6wYAPaJeP1yl3bgWNMD4ompU8R69TUZR17vZWSQ41J1NcmXJrMiwKj9GoNsibhm
 W4eOYaJxFTiFWw12qHd7re9W2WdsG8qRZnRUtJ7w09mKM5Di8iEJNvYxfPQXt0BD
 3fVb8biKlPu38B+ow9pSv+7D0L75c92q+OM3/e2Hsa/I65G02+BrgiM/XRZHnvvh
 /MvbQT+UbYLqehZj2CiWnIH73UOYd/Y3ComBbszuThxrsG1hCmK7hEebZMY++nSL
 iJb/4P2S+vxAr18sWw==
 =Uxxc
 -----END PGP SIGNATURE-----

Merge tag 'extcon-next-for-6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-next

Chanwoo writes:

Update extcon next for v6.2

Detailed description for this pull request:
- Replace irqchip mask_invert with unmask_base
  to remove deprecated mask_invert flag for extcon-max77843.c

- Convert to i2c's .probe_new style for extcon-fsa9480,
  extcon-rt8973 and extcon-usbc-uusb320.c

* tag 'extcon-next-for-6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon:
  extcon: usbc-tusb320: Convert to i2c's .probe_new()
  extcon: rt8973: Convert to i2c's .probe_new()
  extcon: fsa9480: Convert to i2c's .probe_new()
  extcon: max77843: Replace irqchip mask_invert with unmask_base
This commit is contained in:
Greg Kroah-Hartman 2022-12-03 10:53:13 +01:00
commit f361c96c75
4 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/extcon/extcon-fsa9480.c
View File

@ -257,8 +257,7 @@ static irqreturn_t fsa9480_irq_handler(int irq, void *data)
return IRQ_HANDLED;
}
static int fsa9480_probe(struct i2c_client *client,
const struct i2c_device_id *id)
static int fsa9480_probe(struct i2c_client *client)
{
struct fsa9480_usbsw *info;
int ret;
@ -370,7 +369,7 @@ static struct i2c_driver fsa9480_i2c_driver = {
.pm = &fsa9480_pm_ops,
.of_match_table = fsa9480_of_match,
},
.probe = fsa9480_probe,
.probe_new = fsa9480_probe,
.id_table = fsa9480_id,
};

3
drivers/extcon/extcon-max77843.c
View File

@ -189,8 +189,7 @@ static const struct regmap_irq max77843_muic_irq[] = {
static const struct regmap_irq_chip max77843_muic_irq_chip = {
.name = "max77843-muic",
.status_base = MAX77843_MUIC_REG_INT1,
.mask_base = MAX77843_MUIC_REG_INTMASK1,
.mask_invert = true,
.unmask_base = MAX77843_MUIC_REG_INTMASK1,
.num_regs = 3,
.irqs = max77843_muic_irq,
.num_irqs = ARRAY_SIZE(max77843_muic_irq),

5
drivers/extcon/extcon-rt8973a.c
View File

@ -548,8 +548,7 @@ static void rt8973a_init_dev_type(struct rt8973a_muic_info *info)
}
}
static int rt8973a_muic_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
static int rt8973a_muic_i2c_probe(struct i2c_client *i2c)
{
struct device_node *np = i2c->dev.of_node;
struct rt8973a_muic_info *info;
@ -696,7 +695,7 @@ static struct i2c_driver rt8973a_muic_i2c_driver = {
.pm = &rt8973a_muic_pm_ops,
.of_match_table = rt8973a_dt_match,
},
.probe = rt8973a_muic_i2c_probe,
.probe_new = rt8973a_muic_i2c_probe,
.remove = rt8973a_muic_i2c_remove,
.id_table = rt8973a_i2c_id,
};

5
drivers/extcon/extcon-usbc-tusb320.c
View File

@ -421,8 +421,7 @@ static int tusb320_typec_probe(struct i2c_client *client,
return 0;
}
static int tusb320_probe(struct i2c_client *client,
const struct i2c_device_id *id)
static int tusb320_probe(struct i2c_client *client)
{
struct tusb320_priv *priv;
const void *match_data;
@ -495,7 +494,7 @@ static const struct of_device_id tusb320_extcon_dt_match[] = {
MODULE_DEVICE_TABLE(of, tusb320_extcon_dt_match);
static struct i2c_driver tusb320_extcon_driver = {
.probe = tusb320_probe,
.probe_new = tusb320_probe,
.driver = {
.name = "extcon-tusb320",
.of_match_table = tusb320_extcon_dt_match,