1. 29 4月, 2008 11 次提交
    • B
      ide: remove ->INS{W,L} and ->OUTS{W,L} methods · 16bb69c1
      Bartlomiej Zolnierkiewicz 提交于
      * Use ins{w,l}()/outs{w,l}() and __ide_mm_ins{w,l}()/__ide_mm_outs{w,l}()
        directly in ata_{in,out}put_data() (by using IDE_HFLAG_MMIO host flag to
        decide which I/O ops are required).
      
      * Remove no longer needed ->INS{W,L} and ->OUTS{W,L} methods (ide-h8300,
        au1xxx-ide and scc_pata implement their own ->{in,out}put_data methods).
      
      There should be no functional changes caused by this patch.
      Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      16bb69c1
    • B
      ide: add IDE_HFLAG_MMIO host flag (take 2) · c5dd43ec
      Bartlomiej Zolnierkiewicz 提交于
      * Add IDE_HFLAG_MMIO host flag and set it for hosts which use
        default_hwif_mmiops().
      
      v2:
      * Fix kernel panic in pmac host driver (',' should be '|').
      
        Thanks to Kamalesh for reporting it + testing the fix
        and to Andrew for hinting me about the source of the issue.
      
      Cc: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: Stephen Rothwell <sfr@canb.auug.org.au>
      Cc: Andy Whitcroft <apw@shadowen.org>
      Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      c5dd43ec
    • B
      ide-h8300: add ->{in,out}put_data methods (take 2) · f04ff9cb
      Bartlomiej Zolnierkiewicz 提交于
      v2:
      
      * Update ->{in,out}_data methods to take 'struct request *rq' argument.
      
      There should be no functional changes caused by this patch.
      Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      f04ff9cb
    • B
      au1xxx-ide: add ->{in,out}put_data methods (take 2) · 70f91e0d
      Bartlomiej Zolnierkiewicz 提交于
      v2:
      
      * Update ->{in,out}_data methods to take 'struct request *rq' argument.
      
      There should be no functional changes caused by this patch.
      Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      70f91e0d
    • B
      scc_pata: add ->{in,out}put_data methods (take 2) · efa3db1b
      Bartlomiej Zolnierkiewicz 提交于
      v2:
      
      * Update ->{in,out}_data methods to take 'struct request *rq' argument
        (thanks to Stephen Rothwell for catching it).
      
      There should be no functional changes caused by this patch.
      
      Cc: Kou Ishizaki <kou.ishizaki@toshiba.co.jp>
      Cc: Akira Iguchi <akira2.iguchi@toshiba.co.jp>
      Cc: Stephen Rothwell <sfr@canb.auug.org.au>
      Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com>
      Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      efa3db1b
    • B
      ide: merge ->atapi_*put_bytes and ->ata_*put_data methods · 9567b349
      Bartlomiej Zolnierkiewicz 提交于
      * Merge ->atapi_{in,out}put_bytes and ->ata_{in,out}put_data methods
        into new ->{in,out}put_data methods which take number of bytes to
        transfer as an argument and always do padding.
      
      While at it:
      
      * Use 'hwif' or 'drive->hwif' instead of 'HWIF(drive)'.
      
      There should be no functional changes caused by this patch (all users
      of ->ata_{in,out}put_data methods were using multiply-of-4 word counts).
      Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      9567b349
    • B
      falconide/q40ide: add ->atapi_*put_bytes and ->ata_*put_data methods (take 2) · 92d3ab27
      Bartlomiej Zolnierkiewicz 提交于
      * Add ->atapi_{in,out}put_bytes and ->ata_{in,out}put_data methods to
        falconide and q40ide host drivers (->ata_* methods are implemented on
        top of ->atapi_* methods so they also do byte-swapping now).
      
      * Cleanup atapi_{in,out}put_bytes().
      
      v2:
      * Add 'struct request *rq' argument to ->ata_{in,out}put_data methods
        and don't byte-swap disk fs requests (we shouldn't un-swap fs requests
        because fs itself is stored byte-swapped on the disk) - this is how
        things were done before the patch (ideally device mapper should be
        used instead but it would break existing setups and would have some
        performance impact).
      
      Cc: Geert Uytterhoeven <geert@linux-m68k.org>
      Cc: Michael Schmitz <schmitz@debian.org>
      Cc: Roman Zippel <zippel@linux-m68k.org>
      Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
      Cc: Richard Zidlicky <rz@linux-m68k.org>
      Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      92d3ab27
    • B
      ide: fix au1xxx-ide breakage · 284aa76b
      Bartlomiej Zolnierkiewicz 提交于
      On Monday 28 April 2008, Sergei Shtylyov wrote:
      > Hello, I wrote:
      > 
      > > Fix these warnings emitted when compiling drivers/ide/mips/au1xxx-ide.c:
      > 
      > > include/asm/mach-au1x00/au1xxx_ide.h:137: warning: 'auide_tune_drive' declared 
      > > `static' but never defined
      > > include/asm/mach-au1x00/au1xxx_ide.h:138: warning: 'auide_tune_chipset' declared
      > >  `static' but never defined
      > 
      > > by wiping out the whole "function prototyping" section from the header file
      > > <asm-mips/mach-au1x00/au1xxx_ide.h> as it mostly declared functions that are
      > > already dead in the IDE driver; move the only useful prototype into the driver.
      > > 
      > > Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
      > 
      > > ---
      > > I'm not sure thru which tree this should go -- probably thru Linux/MIPS one...
      > 
      > > Bart, au1xxx-ide-fix-mwdma-support.patch will probably need to be updated to
      > > remove that added prototype since it won't be needed anymore...
      > 
      >     Which you haven't done either in that patch or in 
      > au1xxx-ide-use-init_dma-method.patch. So, face the consequences:
      > 
      > drivers/ide/mips/au1xxx-ide.c:456: error: conflicting types for 'auide_ddma_init'
      > drivers/ide/mips/au1xxx-ide.c:51: error: previous declaration of
      > 'auide_ddma_init' was here
      > drivers/ide/mips/au1xxx-ide.c:456: error: conflicting types for 'auide_ddma_init'
      > drivers/ide/mips/au1xxx-ide.c:51: error: previous declaration of
      > 'auide_ddma_init' was here
      > drivers/ide/mips/au1xxx-ide.c:51: warning: 'auide_ddma_init' used but never
      > defined
      
      Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com>
      Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      284aa76b
    • A
      q40ide breakage · d28aa3ac
      Al Viro 提交于
      again, fallout from ide merge
      Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      d28aa3ac
    • A
      7d896e0b
    • S
      [MIPS] Pb1200/DBAu1200: move platform code to its proper place · fcbd3b4b
      Sergei Shtylyov 提交于
      Since both the IDE interface and SMC 91C111 Ethernet chip are on-board
      devices, not SOC devices, move the platform device registration form the
      common to the board specific code.
      
      While at it, remove semicolon (which didn't break compilation only by
      chance) from the AU1XXX_ATA_DDMA_REQ macro and do some renaming:
      
      - change 'au1200_ide0_' variable name prefix to the mere 'ide_';
      
      - change 'smc91x_' variable name prefix to 'smc91c111_' since that's the
        name of the chip used on the boards;
      
      - drop 'AU1XXX_' prefix from the names of macros describing IDE and Ethernet
        on-board devices;
      
      - change 'SMC91111_' to 'SMC91C111_', change 'IRQ' to 'INT' in the names of
        the macros describing the Ethernet chip for consistency with the IDE
        macros;
      
      - change 'ATA_' to 'IDE_' and 'OFFSET' to 'SHIFT' (since this value is
        indeed a shift count) in the names of the macros describing the IDE
        interface.
      Signed-off-by: NSergei Shtylyov <sshtylyov@ru.mvista.com>
      Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      fcbd3b4b
  2. 27 4月, 2008 29 次提交