Commit f361c96c authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'extcon-next-for-6.2' of... 

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
parents 11fa7fef 5313121b

drivers/extcon/extcon-fsa9480.c

+2 −3
Original line number Diff line number Diff line
@@ -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,

};

drivers/extcon/extcon-max77843.c

+1 −2
Original line number Diff line number Diff line
@@ -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),

drivers/extcon/extcon-rt8973a.c

+2 −3
Original line number Diff line number Diff line
@@ -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,

};

drivers/extcon/extcon-usbc-tusb320.c

+2 −3
Original line number Diff line number Diff line
@@ -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,