Skip to content

Commit f361c96

Browse files
committed
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
2 parents 11fa7fe + 5313121 commit f361c96

File tree

4 files changed

+7
-11
lines changed

4 files changed

+7
-11
lines changed

drivers/extcon/extcon-fsa9480.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -257,8 +257,7 @@ static irqreturn_t fsa9480_irq_handler(int irq, void *data)
257257
return IRQ_HANDLED;
258258
}
259259

260-
static int fsa9480_probe(struct i2c_client *client,
261-
const struct i2c_device_id *id)
260+
static int fsa9480_probe(struct i2c_client *client)
262261
{
263262
struct fsa9480_usbsw *info;
264263
int ret;
@@ -370,7 +369,7 @@ static struct i2c_driver fsa9480_i2c_driver = {
370369
.pm = &fsa9480_pm_ops,
371370
.of_match_table = fsa9480_of_match,
372371
},
373-
.probe = fsa9480_probe,
372+
.probe_new = fsa9480_probe,
374373
.id_table = fsa9480_id,
375374
};
376375

drivers/extcon/extcon-max77843.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,8 +189,7 @@ static const struct regmap_irq max77843_muic_irq[] = {
189189
static const struct regmap_irq_chip max77843_muic_irq_chip = {
190190
.name = "max77843-muic",
191191
.status_base = MAX77843_MUIC_REG_INT1,
192-
.mask_base = MAX77843_MUIC_REG_INTMASK1,
193-
.mask_invert = true,
192+
.unmask_base = MAX77843_MUIC_REG_INTMASK1,
194193
.num_regs = 3,
195194
.irqs = max77843_muic_irq,
196195
.num_irqs = ARRAY_SIZE(max77843_muic_irq),

drivers/extcon/extcon-rt8973a.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -548,8 +548,7 @@ static void rt8973a_init_dev_type(struct rt8973a_muic_info *info)
548548
}
549549
}
550550

551-
static int rt8973a_muic_i2c_probe(struct i2c_client *i2c,
552-
const struct i2c_device_id *id)
551+
static int rt8973a_muic_i2c_probe(struct i2c_client *i2c)
553552
{
554553
struct device_node *np = i2c->dev.of_node;
555554
struct rt8973a_muic_info *info;
@@ -696,7 +695,7 @@ static struct i2c_driver rt8973a_muic_i2c_driver = {
696695
.pm = &rt8973a_muic_pm_ops,
697696
.of_match_table = rt8973a_dt_match,
698697
},
699-
.probe = rt8973a_muic_i2c_probe,
698+
.probe_new = rt8973a_muic_i2c_probe,
700699
.remove = rt8973a_muic_i2c_remove,
701700
.id_table = rt8973a_i2c_id,
702701
};

drivers/extcon/extcon-usbc-tusb320.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -421,8 +421,7 @@ static int tusb320_typec_probe(struct i2c_client *client,
421421
return 0;
422422
}
423423

424-
static int tusb320_probe(struct i2c_client *client,
425-
const struct i2c_device_id *id)
424+
static int tusb320_probe(struct i2c_client *client)
426425
{
427426
struct tusb320_priv *priv;
428427
const void *match_data;
@@ -495,7 +494,7 @@ static const struct of_device_id tusb320_extcon_dt_match[] = {
495494
MODULE_DEVICE_TABLE(of, tusb320_extcon_dt_match);
496495

497496
static struct i2c_driver tusb320_extcon_driver = {
498-
.probe = tusb320_probe,
497+
.probe_new = tusb320_probe,
499498
.driver = {
500499
.name = "extcon-tusb320",
501500
.of_match_table = tusb320_extcon_dt_match,

0 commit comments

Comments
 (0)