Re: [PATCH 02/10] Blackfin SPI driver: use new GPIO API and add error handling

[David Brownell <david-b@pacbell.net>]

On Thursday 11 October 2007, Bryan Wu wrote:
> On Thu, 2007-10-11 at 23:26 -0700, David Brownell wrote:
> > On Thursday 11 October 2007, Bryan Wu wrote:
> > > @@ -1182,12 +1198,9 @@ static int __init bfin5xx_spi_probe(struct platform_device *pdev)
> > >                 return -ENOMEM;
> > >         }
> > >  
> > > -       if (peripheral_request(P_SPI0_SCK, DRV_NAME) ||
> > > -                peripheral_request(P_SPI0_MISO, DRV_NAME) ||
> > > -                peripheral_request(P_SPI0_MOSI, DRV_NAME) ) {
> > > -
> > > +       if (setup_pin_mux(1)) {
> > >                 dev_err(&pdev->dev, ": Requesting Peripherals failed\n");
> > > -               goto out_error_queue_alloc;
> > > +               goto out_error;
> > >         }
> > >  
> > >         drv_data = spi_master_get_devdata(master);
> > > 
> > 
> > Still doesn't apply ... what tree are you generating this series against??
> 
> I apply this patch on Linus git tree at 2.6.23 tag

Then why don't my copies of that tree have the lines flagged
above with "-" ??

In fact, if I look at the kernel.org GIT tree, it doesn't have
them either.  Your tree must have somehow gotten a bunch of
private changes.


> git-request-pull output:
> ---
> The following changes since commit bbf25010f1a6b761914430f5fca081ec8c7accd1:
>   Linus Torvalds (1):
>         Linux 2.6.23
> 
> Bryan Wu (4):
>       Blackfin SPI driver: Initial supporting BF54x in SPI driver
>       Blackfin SPI driver: add error handing
>       Blackfin SPI driver: Blackfin SPI driver does not respect the per-transfer cs_change field
>       Blackfin SPI driver: update spi driver to support multi-ports
> 
> Michael Hennerich (1):
>       Blackfin SPI driver: use new GPIO API and add error handling
> 
> Mike Frysinger (1):
>       Blackfin SPI driver: prevent people from setting bits in ctl_reg
> 
> Sonic Zhang (4):
>       Blackfin SPI driver: Add SPI master controller platform device 1
>       Blackfin SPI driver: Move GPIO config to setup and cleanup
>       Blackfin SPI driver: Fix SPI driver to work with SPI flash ST25P16 on bf548
>       Blackfin SPI driver: Clean up useless wait in bfin SPI driver
> 
>  drivers/spi/spi_bfin5xx.c                       |  586 ++++++++++++++---------
>  include/asm-blackfin/mach-bf533/portmux.h       |    2 +-
>  include/asm-blackfin/mach-bf548/defBF54x_base.h |   17 +
>  3 files changed, 373 insertions(+), 232 deletions(-)
> 
> ---
> Need I send out just one SPI patch.
> 
> Thanks
> -Bryan Wu
>