Unverified Commit c74e7af1 authored by Aidan MacDonald's avatar Aidan MacDonald Committed by Mark Brown
Browse files

regmap-irq: Remove unused mask_invert flag 



mask_invert is deprecated and no longer used; it can now be removed.

Signed-off-by: default avatarAidan MacDonald <aidanmacdonald.0x0@gmail.com>
Link: https://lore.kernel.org/r/20230216223200.150679-2-aidanmacdonald.0x0@gmail.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 483e6ea1

drivers/base/regmap/regmap-irq.c

+0 −14
Original line number Original line Diff line number Diff line
@@ -878,20 +878,6 @@ int regmap_add_irq_chip_fwnode(struct fwnode_handle *fwnode, 
		 */

		 */

		dev_warn(map->dev, "mask_base and unmask_base are inverted, please fix it");

		dev_warn(map->dev, "mask_base and unmask_base are inverted, please fix it");





		/* Might as well warn about mask_invert while we're at it... */

		if (chip->mask_invert)

			dev_warn(map->dev, "mask_invert=true ignored");



		d->mask_base = chip->unmask_base;

		d->unmask_base = chip->mask_base;

	} else if (chip->mask_invert) {

		/*

		 * Swap the roles of mask_base and unmask_base if the bits are

		 * inverted. This is deprecated, drivers should use unmask_base

		 * directly.

		 */

		dev_warn(map->dev, "mask_invert=true is deprecated; please switch to unmask_base");



		d->mask_base = chip->unmask_base;

		d->mask_base = chip->unmask_base;

		d->unmask_base = chip->mask_base;

		d->unmask_base = chip->mask_base;

	} else {

	} else {

include/linux/regmap.h

+0 −4
Original line number Original line Diff line number Diff line
@@ -1540,9 +1540,6 @@ struct regmap_irq_chip_data; 
 * @config_base: Base address for IRQ type config regs. If null unsupported.

 * @config_base: Base address for IRQ type config regs. If null unsupported.

 * @irq_reg_stride:  Stride to use for chips where registers are not contiguous.

 * @irq_reg_stride:  Stride to use for chips where registers are not contiguous.

 * @init_ack_masked: Ack all masked interrupts once during initalization.

 * @init_ack_masked: Ack all masked interrupts once during initalization.

 * @mask_invert: Inverted mask register: cleared bits are masked out.

 *		 Deprecated; prefer describing an inverted mask register as

 *		 an unmask register.

 * @mask_unmask_non_inverted: Controls mask bit inversion for chips that set

 * @mask_unmask_non_inverted: Controls mask bit inversion for chips that set

 *	both @mask_base and @unmask_base. If false, mask and unmask bits are

 *	both @mask_base and @unmask_base. If false, mask and unmask bits are

 *	inverted (which is deprecated behavior); if true, bits will not be

 *	inverted (which is deprecated behavior); if true, bits will not be
@@ -1624,7 +1621,6 @@ struct regmap_irq_chip { 
	const unsigned int *config_base;

	const unsigned int *config_base;

	unsigned int irq_reg_stride;

	unsigned int irq_reg_stride;

	unsigned int init_ack_masked:1;

	unsigned int init_ack_masked:1;

	unsigned int mask_invert:1;

	unsigned int mask_unmask_non_inverted:1;

	unsigned int mask_unmask_non_inverted:1;

	unsigned int use_ack:1;

	unsigned int use_ack:1;

	unsigned int ack_invert:1;

	unsigned int ack_invert:1;