diff options
Diffstat (limited to 'drivers/net/wan/z85230.c')
-rw-r--r-- | drivers/net/wan/z85230.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wan/z85230.c b/drivers/net/wan/z85230.c index fbf5e843d48c..0806232e0f8f 100644 --- a/drivers/net/wan/z85230.c +++ b/drivers/net/wan/z85230.c | |||
@@ -542,7 +542,7 @@ static void z8530_dma_tx(struct z8530_channel *chan) | |||
542 | z8530_tx(chan); | 542 | z8530_tx(chan); |
543 | return; | 543 | return; |
544 | } | 544 | } |
545 | /* This shouldnt occur in DMA mode */ | 545 | /* This shouldn't occur in DMA mode */ |
546 | printk(KERN_ERR "DMA tx - bogus event!\n"); | 546 | printk(KERN_ERR "DMA tx - bogus event!\n"); |
547 | z8530_tx(chan); | 547 | z8530_tx(chan); |
548 | } | 548 | } |
@@ -766,7 +766,7 @@ irqreturn_t z8530_interrupt(int irq, void *dev_id) | |||
766 | 766 | ||
767 | EXPORT_SYMBOL(z8530_interrupt); | 767 | EXPORT_SYMBOL(z8530_interrupt); |
768 | 768 | ||
769 | static char reg_init[16]= | 769 | static const u8 reg_init[16]= |
770 | { | 770 | { |
771 | 0,0,0,0, | 771 | 0,0,0,0, |
772 | 0,0,0,0, | 772 | 0,0,0,0, |
@@ -1206,7 +1206,7 @@ EXPORT_SYMBOL(z8530_sync_txdma_close); | |||
1206 | * it exists... | 1206 | * it exists... |
1207 | */ | 1207 | */ |
1208 | 1208 | ||
1209 | static char *z8530_type_name[]={ | 1209 | static const char *z8530_type_name[]={ |
1210 | "Z8530", | 1210 | "Z8530", |
1211 | "Z85C30", | 1211 | "Z85C30", |
1212 | "Z85230" | 1212 | "Z85230" |
@@ -1219,7 +1219,7 @@ static char *z8530_type_name[]={ | |||
1219 | * @io: the port value in question | 1219 | * @io: the port value in question |
1220 | * | 1220 | * |
1221 | * Describe a Z8530 in a standard format. We must pass the I/O as | 1221 | * Describe a Z8530 in a standard format. We must pass the I/O as |
1222 | * the port offset isnt predictable. The main reason for this function | 1222 | * the port offset isn't predictable. The main reason for this function |
1223 | * is to try and get a common format of report. | 1223 | * is to try and get a common format of report. |
1224 | */ | 1224 | */ |
1225 | 1225 | ||
@@ -1588,7 +1588,7 @@ static void z8530_rx_done(struct z8530_channel *c) | |||
1588 | unsigned long flags; | 1588 | unsigned long flags; |
1589 | 1589 | ||
1590 | /* | 1590 | /* |
1591 | * Complete this DMA. Neccessary to find the length | 1591 | * Complete this DMA. Necessary to find the length |
1592 | */ | 1592 | */ |
1593 | 1593 | ||
1594 | flags=claim_dma_lock(); | 1594 | flags=claim_dma_lock(); |
@@ -1657,7 +1657,7 @@ static void z8530_rx_done(struct z8530_channel *c) | |||
1657 | * fifo length for this. Thus we want to flip to the new | 1657 | * fifo length for this. Thus we want to flip to the new |
1658 | * buffer and then mess around copying and allocating | 1658 | * buffer and then mess around copying and allocating |
1659 | * things. For the current case it doesn't matter but | 1659 | * things. For the current case it doesn't matter but |
1660 | * if you build a system where the sync irq isnt blocked | 1660 | * if you build a system where the sync irq isn't blocked |
1661 | * by the kernel IRQ disable then you need only block the | 1661 | * by the kernel IRQ disable then you need only block the |
1662 | * sync IRQ for the RT_LOCK area. | 1662 | * sync IRQ for the RT_LOCK area. |
1663 | * | 1663 | * |