linux-next: manual merge of the gpio tree with Linus' tree

linux-next: manual merge of the gpio tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1172 bytes --]

Hi Linus,

Today's linux-next merge of the gpio tree got a conflict in
drivers/gpio/gpio-mcp23s08.c between commit 99e4b98dbe3a ("gpio:
mcp23s08: Bug fix of SPI device tree registration") from Linus' tree
and commit 3e3bed913e8b ("gpio: mcp23s08: fixed count variable for
devicetree probing") from the gpio tree.

I fixed it up (one way - see below) and can carry the fix as necessary
(no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/gpio/gpio-mcp23s08.c
index 3d53fd6880d1,00fbb30b9b10..000000000000
--- a/drivers/gpio/gpio-mcp23s08.c
+++ b/drivers/gpio/gpio-mcp23s08.c
@@@ -894,11 -894,14 +894,12 @@@ static int mcp23s08_probe(struct spi_de
  			dev_err(&spi->dev, "invalid spi-present-mask\n");
  			return -ENODEV;
  		}
+ 
  		for (addr = 0; addr < ARRAY_SIZE(pdata->chip); addr++) {
- 			if ((spi_present_mask & (1 << addr)))
- 				chips++;
  			pullups[addr] = 0;
+ 			if (spi_present_mask & (1 << addr))
+ 				chips++;
  		}
 -		if (!chips)
 -			return -ENODEV;
  	} else {
  		type = spi_get_device_id(spi)->driver_data;
  		pdata = dev_get_platdata(&spi->dev);

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: manual merge of the gpio tree with Linus' tree

[Michael Welling]

On Wed, May 28, 2014 at 07:00:11PM +1000, Stephen Rothwell wrote:
> Hi Linus,
> 
> Today's linux-next merge of the gpio tree got a conflict in
> drivers/gpio/gpio-mcp23s08.c between commit 99e4b98dbe3a ("gpio:
> mcp23s08: Bug fix of SPI device tree registration") from Linus' tree
> and commit 3e3bed913e8b ("gpio: mcp23s08: fixed count variable for
> devicetree probing") from the gpio tree.
> 
> I fixed it up (one way - see below) and can carry the fix as necessary
> (no action is required).
> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> 
> diff --cc drivers/gpio/gpio-mcp23s08.c
> index 3d53fd6880d1,00fbb30b9b10..000000000000
> --- a/drivers/gpio/gpio-mcp23s08.c
> +++ b/drivers/gpio/gpio-mcp23s08.c
> @@@ -894,11 -894,14 +894,12 @@@ static int mcp23s08_probe(struct spi_de
>   			dev_err(&spi->dev, "invalid spi-present-mask\n");
>   			return -ENODEV;
>   		}
> + 
>   		for (addr = 0; addr < ARRAY_SIZE(pdata->chip); addr++) {
> - 			if ((spi_present_mask & (1 << addr)))
> - 				chips++;
>   			pullups[addr] = 0;
> + 			if (spi_present_mask & (1 << addr))
> + 				chips++;
>   		}
>  -		if (!chips)
>  -			return -ENODEV;
>   	} else {
>   		type = spi_get_device_id(spi)->driver_data;
>   		pdata = dev_get_platdata(&spi->dev);


Looking at the Linux next version, I am fairly certian that the following is
redundant checking:
                if (chips < 0) {
                        dev_err(&spi->dev, "FATAL: invalid negative chip id\n");
                        goto fail;
                }

The chips variable should equal the number of bits in the spi_present_mask variable.
Or am I missing something?

Re: linux-next: manual merge of the gpio tree with Linus' tree

[Michael Stickel]

Am 28.05.2014 15:38, schrieb Michael Welling:
> Looking at the Linux next version, I am fairly certian that the following is
> redundant checking:
>                 if (chips < 0) {
>                         dev_err(&spi->dev, "FATAL: invalid negative chip id\n");
>                         goto fail;
>                 }
> 
> The chips variable should equal the number of bits in the spi_present_mask variable.
> Or am I missing something?

Can be left out. Was just a paranoid check, because with the missing
increment in the of path it became negative.


-- 
------------------------------------------------------------------------
   Michael Stickel                Tel.   +49 4321 559 56-29
   mycable GmbH                   Fax    +49 4321 559 56-10
   Gartenstrasse 10
   24534 Neumuenster, Germany     Email ms@mycable.de
------------------------------------------------------------------------
   mycable GmbH, Managing Director: Michael Carstens-Behrens
   USt-IdNr: DE 214 231 199, Amtsgericht Kiel, HRB 1797 NM
------------------------------------------------------------------------
   This e-mail and any files transmitted with it are confidential and
   intended solely for the use of the individual or entity to whom
   they are addressed. If you have received this e-mail in error,
   please notify the sender and delete all copies from your system.
------------------------------------------------------------------------

linux-next: manual merge of the gpio tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2052 bytes --]

Hi all,

Today's linux-next merge of the gpio tree got a conflict in:

  drivers/gpio/gpiolib.c

between commit:

  8959b304c706 ("gpiolib: Fix irq_disable() semantics")

from Linus' tree and commit:

  a0b66a73785c ("gpio: Rename variable in core APIs")

from the gpio tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/gpio/gpiolib.c
index 00fb91feba70,c2cc437ce831..000000000000
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@@ -2304,25 -2443,18 +2443,25 @@@ static void gpiochip_irq_enable(struct 
  
  static void gpiochip_irq_disable(struct irq_data *d)
  {
- 	struct gpio_chip *chip = irq_data_get_irq_chip_data(d);
+ 	struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
  
 +	/*
 +	 * Since we override .irq_disable() we need to mimic the
 +	 * behaviour of __irq_disable() in irq/chip.c.
 +	 * First call .irq_disable() if it exists, else mimic the
 +	 * behaviour of mask_irq() which calls .irq_mask() if
 +	 * it exists.
 +	 */
- 	if (chip->irq.irq_disable)
- 		chip->irq.irq_disable(d);
- 	else if (chip->irq.chip->irq_mask)
- 		chip->irq.chip->irq_mask(d);
- 	gpiochip_disable_irq(chip, d->hwirq);
+ 	if (gc->irq.irq_disable)
+ 		gc->irq.irq_disable(d);
 -	else
++	else if (gc->irq.chip->irq_mask)
+ 		gc->irq.chip->irq_mask(d);
+ 	gpiochip_disable_irq(gc, d->hwirq);
  }
  
- static void gpiochip_set_irq_hooks(struct gpio_chip *gpiochip)
+ static void gpiochip_set_irq_hooks(struct gpio_chip *gc)
  {
- 	struct irq_chip *irqchip = gpiochip->irq.chip;
+ 	struct irq_chip *irqchip = gc->irq.chip;
  
  	if (!irqchip->irq_request_resources &&
  	    !irqchip->irq_release_resources) {

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the gpio tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 441 bytes --]

Hi Grant,

Today's linux-next merge of the gpio tree got a conflict in
drivers/gpio/gpio-samsung.c between commit 2760f7adbb6c ("gpio/exynos:
Fix compiler warnings when non-exynos machines are selected") from Linus'
tree and commit fd454997d687 ("gpio: samsung: refactor gpiolib init for
exynos4/5") from the gpio tree.

I used the version from the gpio tree.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]