Commit 1d022f90 authored by Linus Torvalds's avatar Linus Torvalds

Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk

into home.osdl.org:/home/torvalds/v2.5/linux
parents f3016267 89d22544
...@@ -149,34 +149,34 @@ ether1_writebuffer (struct net_device *dev, void *data, unsigned int start, unsi ...@@ -149,34 +149,34 @@ ether1_writebuffer (struct net_device *dev, void *data, unsigned int start, unsi
length -= thislen; length -= thislen;
__asm__ __volatile__( __asm__ __volatile__(
"subs %3, %3, #2 "subs %3, %3, #2\n\
bmi 2f bmi 2f\n\
1: ldr %0, [%1], #2 1: ldr %0, [%1], #2\n\
mov %0, %0, lsl #16 mov %0, %0, lsl #16\n\
orr %0, %0, %0, lsr #16 orr %0, %0, %0, lsr #16\n\
str %0, [%2], #4 str %0, [%2], #4\n\
subs %3, %3, #2 subs %3, %3, #2\n\
bmi 2f bmi 2f\n\
ldr %0, [%1], #2 ldr %0, [%1], #2\n\
mov %0, %0, lsl #16 mov %0, %0, lsl #16\n\
orr %0, %0, %0, lsr #16 orr %0, %0, %0, lsr #16\n\
str %0, [%2], #4 str %0, [%2], #4\n\
subs %3, %3, #2 subs %3, %3, #2\n\
bmi 2f bmi 2f\n\
ldr %0, [%1], #2 ldr %0, [%1], #2\n\
mov %0, %0, lsl #16 mov %0, %0, lsl #16\n\
orr %0, %0, %0, lsr #16 orr %0, %0, %0, lsr #16\n\
str %0, [%2], #4 str %0, [%2], #4\n\
subs %3, %3, #2 subs %3, %3, #2\n\
bmi 2f bmi 2f\n\
ldr %0, [%1], #2 ldr %0, [%1], #2\n\
mov %0, %0, lsl #16 mov %0, %0, lsl #16\n\
orr %0, %0, %0, lsr #16 orr %0, %0, %0, lsr #16\n\
str %0, [%2], #4 str %0, [%2], #4\n\
subs %3, %3, #2 subs %3, %3, #2\n\
bpl 1b bpl 1b\n\
2: adds %3, %3, #1 2: adds %3, %3, #1\n\
ldreqb %0, [%1] ldreqb %0, [%1]\n\
streqb %0, [%2]" streqb %0, [%2]"
: "=&r" (used), "=&r" (data) : "=&r" (used), "=&r" (data)
: "r" (addr), "r" (thislen), "1" (data)); : "r" (addr), "r" (thislen), "1" (data));
...@@ -211,34 +211,34 @@ ether1_readbuffer (struct net_device *dev, void *data, unsigned int start, unsig ...@@ -211,34 +211,34 @@ ether1_readbuffer (struct net_device *dev, void *data, unsigned int start, unsig
length -= thislen; length -= thislen;
__asm__ __volatile__( __asm__ __volatile__(
"subs %3, %3, #2 "subs %3, %3, #2\n\
bmi 2f bmi 2f\n\
1: ldr %0, [%2], #4 1: ldr %0, [%2], #4\n\
strb %0, [%1], #1 strb %0, [%1], #1\n\
mov %0, %0, lsr #8 mov %0, %0, lsr #8\n\
strb %0, [%1], #1 strb %0, [%1], #1\n\
subs %3, %3, #2 subs %3, %3, #2\n\
bmi 2f bmi 2f\n\
ldr %0, [%2], #4 ldr %0, [%2], #4\n\
strb %0, [%1], #1 strb %0, [%1], #1\n\
mov %0, %0, lsr #8 mov %0, %0, lsr #8\n\
strb %0, [%1], #1 strb %0, [%1], #1\n\
subs %3, %3, #2 subs %3, %3, #2\n\
bmi 2f bmi 2f\n\
ldr %0, [%2], #4 ldr %0, [%2], #4\n\
strb %0, [%1], #1 strb %0, [%1], #1\n\
mov %0, %0, lsr #8 mov %0, %0, lsr #8\n\
strb %0, [%1], #1 strb %0, [%1], #1\n\
subs %3, %3, #2 subs %3, %3, #2\n\
bmi 2f bmi 2f\n\
ldr %0, [%2], #4 ldr %0, [%2], #4\n\
strb %0, [%1], #1 strb %0, [%1], #1\n\
mov %0, %0, lsr #8 mov %0, %0, lsr #8\n\
strb %0, [%1], #1 strb %0, [%1], #1\n\
subs %3, %3, #2 subs %3, %3, #2\n\
bpl 1b bpl 1b\n\
2: adds %3, %3, #1 2: adds %3, %3, #1\n\
ldreqb %0, [%2] ldreqb %0, [%2]\n\
streqb %0, [%1]" streqb %0, [%1]"
: "=&r" (used), "=&r" (data) : "=&r" (used), "=&r" (data)
: "r" (addr), "r" (thislen), "1" (data)); : "r" (addr), "r" (thislen), "1" (data));
......
This diff is collapsed.
...@@ -13,13 +13,13 @@ ...@@ -13,13 +13,13 @@
#define ACORNSCSI_H #define ACORNSCSI_H
/* SBIC registers */ /* SBIC registers */
#define OWNID 0 #define SBIC_OWNID 0
#define OWNID_FS1 (1<<7) #define OWNID_FS1 (1<<7)
#define OWNID_FS2 (1<<6) #define OWNID_FS2 (1<<6)
#define OWNID_EHP (1<<4) #define OWNID_EHP (1<<4)
#define OWNID_EAF (1<<3) #define OWNID_EAF (1<<3)
#define CTRL 1 #define SBIC_CTRL 1
#define CTRL_DMAMODE (1<<7) #define CTRL_DMAMODE (1<<7)
#define CTRL_DMADBAMODE (1<<6) #define CTRL_DMADBAMODE (1<<6)
#define CTRL_DMABURST (1<<5) #define CTRL_DMABURST (1<<5)
...@@ -30,25 +30,25 @@ ...@@ -30,25 +30,25 @@
#define CTRL_HA (1<<1) #define CTRL_HA (1<<1)
#define CTRL_HSP (1<<0) #define CTRL_HSP (1<<0)
#define TIMEOUT 2 #define SBIC_TIMEOUT 2
#define TOTSECTS 3 #define SBIC_TOTSECTS 3
#define TOTHEADS 4 #define SBIC_TOTHEADS 4
#define TOTCYLH 5 #define SBIC_TOTCYLH 5
#define TOTCYLL 6 #define SBIC_TOTCYLL 6
#define LOGADDRH 7 #define SBIC_LOGADDRH 7
#define LOGADDRM2 8 #define SBIC_LOGADDRM2 8
#define LOGADDRM1 9 #define SBIC_LOGADDRM1 9
#define LOGADDRL 10 #define SBIC_LOGADDRL 10
#define SECTORNUM 11 #define SBIC_SECTORNUM 11
#define HEADNUM 12 #define SBIC_HEADNUM 12
#define CYLH 13 #define SBIC_CYLH 13
#define CYLL 14 #define SBIC_CYLL 14
#define TARGETLUN 15 #define SBIC_TARGETLUN 15
#define TARGETLUN_TLV (1<<7) #define TARGETLUN_TLV (1<<7)
#define TARGETLUN_DOK (1<<6) #define TARGETLUN_DOK (1<<6)
#define CMNDPHASE 16 #define SBIC_CMNDPHASE 16
#define SYNCHTRANSFER 17 #define SBIC_SYNCHTRANSFER 17
#define SYNCHTRANSFER_OF0 0x00 #define SYNCHTRANSFER_OF0 0x00
#define SYNCHTRANSFER_OF1 0x01 #define SYNCHTRANSFER_OF1 0x01
#define SYNCHTRANSFER_OF2 0x02 #define SYNCHTRANSFER_OF2 0x02
...@@ -70,21 +70,21 @@ ...@@ -70,21 +70,21 @@
#define SYNCHTRANSFER_6DBA 0x60 #define SYNCHTRANSFER_6DBA 0x60
#define SYNCHTRANSFER_7DBA 0x70 #define SYNCHTRANSFER_7DBA 0x70
#define TRANSCNTH 18 #define SBIC_TRANSCNTH 18
#define TRANSCNTM 19 #define SBIC_TRANSCNTM 19
#define TRANSCNTL 20 #define SBIC_TRANSCNTL 20
#define DESTID 21 #define SBIC_DESTID 21
#define DESTID_SCC (1<<7) #define DESTID_SCC (1<<7)
#define DESTID_DPD (1<<6) #define DESTID_DPD (1<<6)
#define SOURCEID 22 #define SBIC_SOURCEID 22
#define SOURCEID_ER (1<<7) #define SOURCEID_ER (1<<7)
#define SOURCEID_ES (1<<6) #define SOURCEID_ES (1<<6)
#define SOURCEID_DSP (1<<5) #define SOURCEID_DSP (1<<5)
#define SOURCEID_SIV (1<<4) #define SOURCEID_SIV (1<<4)
#define SSR 23 #define SBIC_SSR 23
#define CMND 24 #define SBIC_CMND 24
#define CMND_RESET 0x00 #define CMND_RESET 0x00
#define CMND_ABORT 0x01 #define CMND_ABORT 0x01
#define CMND_ASSERTATN 0x02 #define CMND_ASSERTATN 0x02
...@@ -113,8 +113,8 @@ ...@@ -113,8 +113,8 @@
#define CMND_XFERINFO 0x20 #define CMND_XFERINFO 0x20
#define CMND_SBT (1<<7) #define CMND_SBT (1<<7)
#define DATA 25 #define SBIC_DATA 25
#define ASR 26 #define SBIC_ASR 26
#define ASR_INT (1<<7) #define ASR_INT (1<<7)
#define ASR_LCI (1<<6) #define ASR_LCI (1<<6)
#define ASR_BSY (1<<5) #define ASR_BSY (1<<5)
...@@ -123,22 +123,22 @@ ...@@ -123,22 +123,22 @@
#define ASR_DBR (1<<0) #define ASR_DBR (1<<0)
/* DMAC registers */ /* DMAC registers */
#define INIT 0x00 #define DMAC_INIT 0x00
#define INIT_8BIT (1) #define INIT_8BIT (1)
#define CHANNEL 0x80 #define DMAC_CHANNEL 0x80
#define CHANNEL_0 0x00 #define CHANNEL_0 0x00
#define CHANNEL_1 0x01 #define CHANNEL_1 0x01
#define CHANNEL_2 0x02 #define CHANNEL_2 0x02
#define CHANNEL_3 0x03 #define CHANNEL_3 0x03
#define TXCNTLO 0x01 #define DMAC_TXCNTLO 0x01
#define TXCNTHI 0x81 #define DMAC_TXCNTHI 0x81
#define TXADRLO 0x02 #define DMAC_TXADRLO 0x02
#define TXADRMD 0x82 #define DMAC_TXADRMD 0x82
#define TXADRHI 0x03 #define DMAC_TXADRHI 0x03
#define DEVCON0 0x04 #define DMAC_DEVCON0 0x04
#define DEVCON0_AKL (1<<7) #define DEVCON0_AKL (1<<7)
#define DEVCON0_RQL (1<<6) #define DEVCON0_RQL (1<<6)
#define DEVCON0_EXW (1<<5) #define DEVCON0_EXW (1<<5)
...@@ -148,11 +148,11 @@ ...@@ -148,11 +148,11 @@
#define DEVCON0_AHLD (1<<1) #define DEVCON0_AHLD (1<<1)
#define DEVCON0_MTM (1<<0) #define DEVCON0_MTM (1<<0)
#define DEVCON1 0x84 #define DMAC_DEVCON1 0x84
#define DEVCON1_WEV (1<<1) #define DEVCON1_WEV (1<<1)
#define DEVCON1_BHLD (1<<0) #define DEVCON1_BHLD (1<<0)
#define MODECON 0x05 #define DMAC_MODECON 0x05
#define MODECON_WOED 0x01 #define MODECON_WOED 0x01
#define MODECON_VERIFY 0x00 #define MODECON_VERIFY 0x00
#define MODECON_READ 0x04 #define MODECON_READ 0x04
...@@ -164,14 +164,14 @@ ...@@ -164,14 +164,14 @@
#define MODECON_BLOCK 0x80 #define MODECON_BLOCK 0x80
#define MODECON_CASCADE 0xC0 #define MODECON_CASCADE 0xC0
#define STATUS 0x85 #define DMAC_STATUS 0x85
#define STATUS_TC0 (1<<0) #define STATUS_TC0 (1<<0)
#define STATUS_RQ0 (1<<4) #define STATUS_RQ0 (1<<4)
#define TEMPLO 0x06 #define DMAC_TEMPLO 0x06
#define TEMPHI 0x86 #define DMAC_TEMPHI 0x86
#define REQREG 0x07 #define DMAC_REQREG 0x07
#define MASKREG 0x87 #define DMAC_MASKREG 0x87
#define MASKREG_M0 0x01 #define MASKREG_M0 0x01
#define MASKREG_M1 0x02 #define MASKREG_M1 0x02
#define MASKREG_M2 0x04 #define MASKREG_M2 0x04
......
...@@ -300,7 +300,7 @@ arxescsi_probe(struct expansion_card *ec, const struct ecard_id *id) ...@@ -300,7 +300,7 @@ arxescsi_probe(struct expansion_card *ec, const struct ecard_id *id)
goto out_region; goto out_region;
} }
host = scsi_register(&arxescsi_template, sizeof(struct arxescsi_info)); host = scsi_host_alloc(&arxescsi_template, sizeof(struct arxescsi_info));
if (!host) { if (!host) {
ret = -ENOMEM; ret = -ENOMEM;
goto out_unmap; goto out_unmap;
...@@ -341,7 +341,7 @@ arxescsi_probe(struct expansion_card *ec, const struct ecard_id *id) ...@@ -341,7 +341,7 @@ arxescsi_probe(struct expansion_card *ec, const struct ecard_id *id)
fas216_release(host); fas216_release(host);
out_unregister: out_unregister:
scsi_unregister(host); scsi_host_put(host);
out_unmap: out_unmap:
iounmap(base); iounmap(base);
out_region: out_region:
...@@ -366,7 +366,7 @@ static void __devexit arxescsi_remove(struct expansion_card *ec) ...@@ -366,7 +366,7 @@ static void __devexit arxescsi_remove(struct expansion_card *ec)
release_mem_region(resbase, reslen); release_mem_region(resbase, reslen);
fas216_release(host); fas216_release(host);
scsi_unregister(host); scsi_host_put(host);
} }
static const struct ecard_id arxescsi_cids[] = { static const struct ecard_id arxescsi_cids[] = {
......
...@@ -422,8 +422,8 @@ cumanascsi2_probe(struct expansion_card *ec, const struct ecard_id *id) ...@@ -422,8 +422,8 @@ cumanascsi2_probe(struct expansion_card *ec, const struct ecard_id *id)
goto out_region; goto out_region;
} }
host = scsi_register(&cumanascsi2_template, host = scsi_host_alloc(&cumanascsi2_template,
sizeof(struct cumanascsi2_info)); sizeof(struct cumanascsi2_info));
if (!host) { if (!host) {
ret = -ENOMEM; ret = -ENOMEM;
goto out_unmap; goto out_unmap;
...@@ -498,7 +498,7 @@ cumanascsi2_probe(struct expansion_card *ec, const struct ecard_id *id) ...@@ -498,7 +498,7 @@ cumanascsi2_probe(struct expansion_card *ec, const struct ecard_id *id)
fas216_release(host); fas216_release(host);
out_free: out_free:
scsi_unregister(host); scsi_host_put(host);
out_unmap: out_unmap:
iounmap(base); iounmap(base);
...@@ -531,7 +531,7 @@ static void __devexit cumanascsi2_remove(struct expansion_card *ec) ...@@ -531,7 +531,7 @@ static void __devexit cumanascsi2_remove(struct expansion_card *ec)
release_mem_region(resbase, reslen); release_mem_region(resbase, reslen);
fas216_release(host); fas216_release(host);
scsi_unregister(host); scsi_host_put(host);
} }
static const struct ecard_id cumanascsi2_cids[] = { static const struct ecard_id cumanascsi2_cids[] = {
......
...@@ -529,8 +529,8 @@ eesoxscsi_probe(struct expansion_card *ec, const struct ecard_id *id) ...@@ -529,8 +529,8 @@ eesoxscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
goto out_region; goto out_region;
} }
host = scsi_register(&eesox_template, host = scsi_host_alloc(&eesox_template,
sizeof(struct eesoxscsi_info)); sizeof(struct eesoxscsi_info));
if (!host) { if (!host) {
ret = -ENOMEM; ret = -ENOMEM;
goto out_unmap; goto out_unmap;
...@@ -606,7 +606,7 @@ eesoxscsi_probe(struct expansion_card *ec, const struct ecard_id *id) ...@@ -606,7 +606,7 @@ eesoxscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
out_free: out_free:
device_remove_file(&ec->dev, &dev_attr_bus_term); device_remove_file(&ec->dev, &dev_attr_bus_term);
scsi_unregister(host); scsi_host_put(host);
out_unmap: out_unmap:
iounmap(base); iounmap(base);
...@@ -641,7 +641,7 @@ static void __devexit eesoxscsi_remove(struct expansion_card *ec) ...@@ -641,7 +641,7 @@ static void __devexit eesoxscsi_remove(struct expansion_card *ec)
release_mem_region(resbase, reslen); release_mem_region(resbase, reslen);
fas216_release(host); fas216_release(host);
scsi_unregister(host); scsi_host_put(host);
} }
static const struct ecard_id eesoxscsi_cids[] = { static const struct ecard_id eesoxscsi_cids[] = {
......
...@@ -332,8 +332,8 @@ powertecscsi_probe(struct expansion_card *ec, const struct ecard_id *id) ...@@ -332,8 +332,8 @@ powertecscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
goto out_region; goto out_region;
} }
host = scsi_register(&powertecscsi_template, host = scsi_host_alloc(&powertecscsi_template,
sizeof (struct powertec_info)); sizeof (struct powertec_info));
if (!host) { if (!host) {
ret = -ENOMEM; ret = -ENOMEM;
goto out_unmap; goto out_unmap;
...@@ -407,7 +407,7 @@ powertecscsi_probe(struct expansion_card *ec, const struct ecard_id *id) ...@@ -407,7 +407,7 @@ powertecscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
out_free: out_free:
device_remove_file(&ec->dev, &dev_attr_bus_term); device_remove_file(&ec->dev, &dev_attr_bus_term);
scsi_unregister(host); scsi_host_put(host);
out_unmap: out_unmap:
iounmap(base); iounmap(base);
...@@ -442,7 +442,7 @@ static void __devexit powertecscsi_remove(struct expansion_card *ec) ...@@ -442,7 +442,7 @@ static void __devexit powertecscsi_remove(struct expansion_card *ec)
release_mem_region(resbase, reslen); release_mem_region(resbase, reslen);
fas216_release(host); fas216_release(host);
scsi_unregister(host); scsi_host_put(host);
} }
static const struct ecard_id powertecscsi_cids[] = { static const struct ecard_id powertecscsi_cids[] = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment