Re: [PATCH 10/21] m68k/scsi: a2091 - Kill ugly DMA() macro

Geert Uytterhoeven
2010-05-13T19:41:45Z

On Mon, May 3, 2010 at 21:25, Geert Uytterhoeven <geert@linux-m68k.org> wrote:
> On Sun, May 2, 2010 at 22:05, James Bottomley <James.Bottomley@suse.de> wrote:
>> On Fri, 2010-04-23 at 10:37 +0200, Geert Uytterhoeven wrote:
>>> On Mon, Apr 5, 2010 at 21:42, Geert Uytterhoeven <geert@linux-m68k.org> wrote:
>>> > On Mon, Apr 5, 2010 at 08:25, Christoph Hellwig <hch@infradead.org> wrote:
>>> >> Instead of abusing the ScsiHost base field I'd prefer if you stick
>>> >
>>> > I wouldn't call it abuse: it's a (MM)IO base address anyway.
>>> > But I see that field was indeed marked `legacy crap' in an otherwise
>>> > innocent looking
>>> > commit to split the SCSI include files... by you ;-)
>>> >
>>> >> a properly typed pointer into the device specific host data.
>>> >
>>> > You mean shost_priv()? That field already contains a pointer to the
>>> > struct WD33C93_hostdata.
>>> >
>>> > But I'll create a new a2091_hostdata struct that contains both the
>>> > WD33C93_hostdata and the a2091_scsiregs pointer (and do the same
>>> > for gvp11.c and a3000.c). It's a bit similar to what sgiwd93.c does, albeit that
>>> > one also uses the legacy base field.
>>>
>>> As I want to avoid introducing bugs by respinning the complicated
>>> parts (the zorro
>>> driver and platform driver conversion patches), I made this change on
>>> top of the 2
>>> whole patch series.
>>>
>>> A2091 part:
>>
>> I've applied up to 10/21 which should make it easier, but this patch
>
> Thanks a lot! (I saw they showed up in linux-next, which is good!)
>
>> refuses to apply:
>>
>> patch: **** malformed patch at line 230: struct scsi_cmnd *SCpnt,
>
> Bummer. I sent those manually from gmail using copy-'n-paste from
> gedit, which _used_
> to work fine w.r.t. whitespace and line breaks. Oh well, they broke it :-(
>
>> could you respin the remaining patches so they'll actually apply?
>
> The remaining 11-21/21 from the original series had been sent using
> git-send-email, so they should apply fine.
>
> I'll resend the other 3 using git-send-email, too. The first 2 should
> apply fine on top
> of the series of 21.
> The third won't apply as it depends on the Amiga platform rework, but we can
> sort that out later. Or I can just take care of it myself, if you approve?

For your convenience, I also put all of them (except for the third
one) in a for-scsi branch
(you already applied the first 10 commits on that branch):

The following changes since commit cea0d767c29669bf89f86e4aee46ef462d2ebae8:
Linus Torvalds (1):
Merge branch 'hwmon-for-linus' of
git://git.kernel.org/.../jdelvare/staging

are available in the git repository at:

master.kernel.org:/pub/scm/linux/kernel/git/geert/linux-m68k.git for-scsi

Geert Uytterhoeven (23):
scsi: wd33c93 - Kill empty wd33c93_release()
m68k/scsi: a2091 - Reindentation
m68k/scsi: gvp11 - Reindentation
m68k/scsi: mvme147 - Reindentation
m68k/scsi: a3000 - Reindentation
m68k/scsi: a2091 - Use shost_priv() and kill ugly HDATA() macro
m68k/scsi: gvp11 - Use shost_priv() and kill ugly HDATA() macro
m68k/scsi: mvme147 - Use shost_priv() and kill ugly HDATA() macro
m68k/scsi: a3000 - Use shost_priv() and kill ugly HDATA() macro
m68k/scsi: a2091 - Kill ugly DMA() macro
m68k/scsi: gvp11 - Kill ugly DMA() macro
m68k/scsi: a3000 - Kill ugly DMA() macro
m68k/scsi: mvme147 - Kill static global mvme147_host
m68k/scsi: a3000 - Kill static global a3000_host
m68k/scsi: gvp11 - Extract check_wd33c93()
m68k/scsi: a2091 - Kill a2091_scsiregs typedef
m68k/scsi: gvp11 - Kill gvp11_scsiregs typedef
m68k/scsi: a3000 - Kill a3000_scsiregs typedef
m68k/scsi: mvme147 - Kill obsolete HOSTS_C logic
m68k: amiga - A2091/A590 SCSI zorro_driver conversion
m68k: amiga - GVP Series II SCSI zorro_driver conversion
m68k/scsi: a2091 - Do not use legacy Scsi_Host.base
m68k/scsi: gvp11 - Do not use legacy Scsi_Host.base

drivers/scsi/a2091.c | 398 ++++++++++++++++++---------------
drivers/scsi/a2091.h | 46 ++--
drivers/scsi/a3000.c | 301 +++++++++++++------------
drivers/scsi/a3000.h | 50 ++--
drivers/scsi/gvp11.c | 582 +++++++++++++++++++++++++-----------------------
drivers/scsi/gvp11.h | 49 ++---
drivers/scsi/mvme147.c | 178 ++++++++--------
drivers/scsi/mvme147.h | 4 +-
drivers/scsi/wd33c93.c | 6 -
drivers/scsi/wd33c93.h | 1 -
10 files changed, 836 insertions(+), 779 deletions(-)

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds