gpio: pci-idio-16: utilize for_each_set_clump8 macro (2dc7c3c1) · Commits · 戴 / test

drivers/gpio/gpio-pci-idio-16.c

+27 −48

Original line number	Diff line number	Diff line
		@@ -100,45 +100,23 @@ static int idio_16_gpio_get_multiple(struct gpio_chip *chip,
		unsigned long mask, unsigned long bits)
		{
		struct idio_16_gpio *const idio16gpio = gpiochip_get_data(chip);
		size_t i;
		const unsigned int gpio_reg_size = 8;
		unsigned int bits_offset;
		size_t word_index;
		unsigned int word_offset;
		unsigned long word_mask;
		const unsigned long port_mask = GENMASK(gpio_reg_size - 1, 0);
		unsigned long port_state;
		unsigned long offset;
		unsigned long gpio_mask;
		void __iomem *ports[] = {
		&idio16gpio->reg->out0_7, &idio16gpio->reg->out8_15,
		&idio16gpio->reg->in0_7, &idio16gpio->reg->in8_15,
		};
		void __iomem *port_addr;
		unsigned long port_state;

		/* clear bits array to a clean slate */
		bitmap_zero(bits, chip->ngpio);

		/* get bits are evaluated a gpio port register at a time */
		for (i = 0; i < ARRAY_SIZE(ports); i++) {
		/* gpio offset in bits array */
		bits_offset = i * gpio_reg_size;

		/* word index for bits array */
		word_index = BIT_WORD(bits_offset);

		/* gpio offset within current word of bits array */
		word_offset = bits_offset % BITS_PER_LONG;
		for_each_set_clump8(offset, gpio_mask, mask, ARRAY_SIZE(ports) * 8) {
		port_addr = ports[offset / 8];
		port_state = ioread8(port_addr) & gpio_mask;

		/* mask of get bits for current gpio within current word */
		word_mask = mask[word_index] & (port_mask << word_offset);
		if (!word_mask) {
		/* no get bits in this port so skip to next one */
		continue;
		}

		/* read bits from current gpio port */
		port_state = ioread8(ports[i]);

		/* store acquired bits at respective bits array offset */
		bits[word_index] \|= (port_state << word_offset) & word_mask;
		bitmap_set_value8(bits, port_state, offset);
		}

		return 0;
		@@ -178,31 +156,32 @@ static void idio_16_gpio_set_multiple(struct gpio_chip *chip,
		unsigned long mask, unsigned long bits)
		{
		struct idio_16_gpio *const idio16gpio = gpiochip_get_data(chip);
		unsigned long offset;
		unsigned long gpio_mask;
		void __iomem *ports[] = {
		&idio16gpio->reg->out0_7, &idio16gpio->reg->out8_15,
		};
		size_t index;
		void __iomem *port_addr;
		unsigned long bitmask;
		unsigned long flags;
		unsigned int out_state;
		unsigned long out_state;

		raw_spin_lock_irqsave(&idio16gpio->lock, flags);
		for_each_set_clump8(offset, gpio_mask, mask, ARRAY_SIZE(ports) * 8) {
		index = offset / 8;
		port_addr = ports[index];

		/* process output lines 0-7 */
		if (*mask & 0xFF) {
		out_state = ioread8(&idio16gpio->reg->out0_7) & ~*mask;
		out_state \|= mask & bits;
		iowrite8(out_state, &idio16gpio->reg->out0_7);
		}
		bitmask = bitmap_get_value8(bits, offset) & gpio_mask;

		/* shift to next output line word */
		*mask >>= 8;
		raw_spin_lock_irqsave(&idio16gpio->lock, flags);

		/* process output lines 8-15 */
		if (*mask & 0xFF) {
		*bits >>= 8;
		out_state = ioread8(&idio16gpio->reg->out8_15) & ~*mask;
		out_state \|= mask & bits;
		iowrite8(out_state, &idio16gpio->reg->out8_15);
		}
		out_state = ioread8(port_addr) & ~gpio_mask;
		out_state \|= bitmask;
		iowrite8(out_state, port_addr);

		raw_spin_unlock_irqrestore(&idio16gpio->lock, flags);
		}
		}

		static void idio_16_irq_ack(struct irq_data *data)
		{

Admin message