[PATCH 1/6] spi: bcm2835: remove dependency on handle_err which is

[PATCH 1/6] spi: bcm2835: remove dependency on handle_err which is

[Martin Sperl]

 in spi-for-next

Remove the implementation of handle_err, the function of which was introduced to
spi-for-next with patch b716c4ff 

Signed-off-by: Martin Sperl <kernel-TqfNSX0MhmxHKSADF0wUEw@public.gmane.org>
Tested-by: Martin Sperl <kernel-TqfNSX0MhmxHKSADF0wUEw@public.gmane.org>
---
 drivers/spi/spi-bcm2835.c |    7 -------
 1 file changed, 7 deletions(-)

Applies against spi - topic/bcm2835

diff --git a/drivers/spi/spi-bcm2835.c b/drivers/spi/spi-bcm2835.c
index 0dbe544..552a633 100644
--- a/drivers/spi/spi-bcm2835.c
+++ b/drivers/spi/spi-bcm2835.c
@@ -216,12 +216,6 @@ static int bcm2835_spi_transfer_one(struct spi_master *master,
 	return 1;
 }
 
-static void bcm2835_spi_handle_err(struct spi_master *master,
-				   struct spi_message *msg)
-{
-	bcm2835_spi_reset_hw(master);
-}
-
 static void bcm2835_spi_set_cs(struct spi_device *spi, bool gpio_level)
 {
 	/*
@@ -315,7 +309,6 @@ static int bcm2835_spi_probe(struct platform_device *pdev)
 	master->setup = bcm2835_spi_setup;
 	master->set_cs = bcm2835_spi_set_cs;
 	master->transfer_one = bcm2835_spi_transfer_one;
-	master->handle_err = bcm2835_spi_handle_err;
 	master->dev.of_node = pdev->dev.of_node;
 
 	bs = spi_master_get_devdata(master);
-- 
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 1/6] spi: bcm2835: remove dependency on handle_err which is

[Mark Brown]

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

On Sun, Mar 29, 2015 at 04:03:22PM +0200, Martin Sperl wrote:
>  in spi-for-next
> 
> Remove the implementation of handle_err, the function of which was introduced to
> spi-for-next with patch b716c4ff 

Why?

When referencing patches please include the patch title as well as the
hash, this makes the mail/commit log more directly readable by humans.

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

Re: [PATCH 1/6] spi: bcm2835: remove dependency on handle_err which is

[Martin Sperl]

> On 29.03.2015, at 18:48, Mark Brown <broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> wrote:
> 
> On Sun, Mar 29, 2015 at 04:03:22PM +0200, Martin Sperl wrote:
>> in spi-for-next
>> 
>> Remove the implementation of handle_err, the function of which was introduced to
>> spi-for-next with patch b716c4ff 
> 
> Why?
> 
> When referencing patches please include the patch title as well as the
> hash, this makes the mail/commit log more directly readable by humans.

This is what I have received and the patch fixes that compile issue...

tree:   git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi topic/bcm2835
head:   31239b1e92ce1efe9caf5d7d7e901ae02a9ad229
commit: 31239b1e92ce1efe9caf5d7d7e901ae02a9ad229 [6/6] SPI: bcm2835: move to the transfer_one driver model
config: powerpc-allmodconfig (attached as .config)
reproduce:
 wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross
 chmod +x ~/bin/make.cross
 git checkout 31239b1e92ce1efe9caf5d7d7e901ae02a9ad229
 # save the attached .config to linux build tree
 make.cross ARCH=powerpc 

All error/warnings:

  drivers/spi/spi-bcm2835.c: In function 'bcm2835_spi_probe':
>> drivers/spi/spi-bcm2835.c:318:8: error: 'struct spi_master' has no member named 'handle_err'
    master->handle_err = bcm2835_spi_handle_err;
          ^

vim +318 drivers/spi/spi-bcm2835.c

  312		master->mode_bits = BCM2835_SPI_MODE_BITS;
  313		master->bits_per_word_mask = SPI_BPW_MASK(8);
  314		master->num_chipselect = 3;
  315		master->setup = bcm2835_spi_setup;
  316		master->set_cs = bcm2835_spi_set_cs;
  317		master->transfer_one = bcm2835_spi_transfer_one;
> 318		master->handle_err = bcm2835_spi_handle_err;
  319		master->dev.of_node = pdev->dev.of_node;
  320	
  321		bs = spi_master_get_devdata(master);


handle_err was introduced to for-next with b716c4ff by Andy Shevchenko
titled: "spi: introduce master->handle_err() callback"

But this is not included in the topic/bcm2835 branch, so the compile fails
because of the missing handle_err in spi_master.

If you merge that one in topic/bcm2835, then you can drop this patch.



--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 1/6] spi: bcm2835: remove dependency on handle_err which is

[Mark Brown]

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

On Sun, Mar 29, 2015 at 07:03:44PM +0200, Martin Sperl wrote:
> > On 29.03.2015, at 18:48, Mark Brown <broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> wrote:

> > Why?

> > When referencing patches please include the patch title as well as the
> > hash, this makes the mail/commit log more directly readable by humans.

> This is what I have received and the patch fixes that compile issue...

...

> handle_err was introduced to for-next with b716c4ff by Andy Shevchenko
> titled: "spi: introduce master->handle_err() callback"

> But this is not included in the topic/bcm2835 branch, so the compile fails
> because of the missing handle_err in spi_master.

> If you merge that one in topic/bcm2835, then you can drop this patch.

Several things here.  First, that merge had already happened so the
problem is gone.  Secondly this is the sort of thing that needs to be in
the commit log - someone reading the commit log should be able to see
why a change is being made - and generally we should be going for the
best fix possible so it would have been better to ask for the merge.

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

Re: [PATCH 1/6] spi: bcm2835: remove dependency on handle_err which is

[Stephen Warren]

On 03/29/2015 10:48 AM, Mark Brown wrote:
> On Sun, Mar 29, 2015 at 04:03:22PM +0200, Martin Sperl wrote:
>> in spi-for-next
>> 
>> Remove the implementation of handle_err, the function of which
>> was introduced to spi-for-next with patch b716c4ff
> 
> Why?
> 
> When referencing patches please include the patch title as well as
> the hash, this makes the mail/commit log more directly readable by
> humans.

I believe these days it's also typical to use a 12-character commit
hash when referencing commits; IIRC Linus suggested the following in
your ~/.gitconfig:

[core]
        abbrev = 12

... which would yield the following:

$ git log --oneline -1 b716c4ff|cat
b716c4ffc6a2 spi: introduce master->handle_err() callback

... so you'd typically write the following in a commit log:

b716c4ffc6a2 (spi: introduce master->handle_err() callback)

--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html