diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-21 15:43:54 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-21 15:43:54 -0400 |
commit | 881bcabbde8bc13854a2cb30847abe181d31c5fd (patch) | |
tree | 4903428777c03b76d8f2b6cdc782098213300126 /drivers | |
parent | e60b9a0346ee08af4715ee5b2d82f705fbe6e309 (diff) | |
parent | f25e918e3546477948be999c3a7d56b316d74e4b (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: Setup CROSS_COMPILE at the top
m68k: Correct the Atari ALLOWINT definition
m68k/video: Create <asm/vga.h>
m68k: Make sure {read,write}s[bwl]() are always defined
m68k/mm: Port OOM changes to do_page_fault()
scsi/atari: Make more functions static
scsi/atari: Revive "atascsi=" setup option
net/ariadne: Improve debug prints
m68k/atari: Change VME irq numbers from unsigned long to unsigned int
m68k/amiga: Use arch_initcall() for registering platform devices
m68k/amiga: Add error checks when registering platform devices
m68k/amiga: Mark z_dev_present() __init
m68k: Remove unused MAX_NOINT_IPL definition
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/ethernet/amd/ariadne.c | 8 | ||||
-rw-r--r-- | drivers/net/ethernet/amd/atarilance.c | 11 | ||||
-rw-r--r-- | drivers/scsi/atari_scsi.c | 26 | ||||
-rw-r--r-- | drivers/scsi/atari_scsi.h | 5 | ||||
-rw-r--r-- | drivers/usb/musb/musb_io.h | 2 |
5 files changed, 27 insertions, 25 deletions
diff --git a/drivers/net/ethernet/amd/ariadne.c b/drivers/net/ethernet/amd/ariadne.c index f4c228e4d76c..f2958df9a1e4 100644 --- a/drivers/net/ethernet/amd/ariadne.c +++ b/drivers/net/ethernet/amd/ariadne.c | |||
@@ -213,10 +213,10 @@ static int ariadne_rx(struct net_device *dev) | |||
213 | (const void *)priv->rx_buff[entry], | 213 | (const void *)priv->rx_buff[entry], |
214 | pkt_len); | 214 | pkt_len); |
215 | skb->protocol = eth_type_trans(skb, dev); | 215 | skb->protocol = eth_type_trans(skb, dev); |
216 | netdev_dbg(dev, "RX pkt type 0x%04x from %pM to %pM data 0x%08x len %d\n", | 216 | netdev_dbg(dev, "RX pkt type 0x%04x from %pM to %pM data %p len %u\n", |
217 | ((u_short *)skb->data)[6], | 217 | ((u_short *)skb->data)[6], |
218 | skb->data + 6, skb->data, | 218 | skb->data + 6, skb->data, |
219 | (int)skb->data, (int)skb->len); | 219 | skb->data, skb->len); |
220 | 220 | ||
221 | netif_rx(skb); | 221 | netif_rx(skb); |
222 | dev->stats.rx_packets++; | 222 | dev->stats.rx_packets++; |
@@ -566,10 +566,10 @@ static netdev_tx_t ariadne_start_xmit(struct sk_buff *skb, | |||
566 | 566 | ||
567 | /* Fill in a Tx ring entry */ | 567 | /* Fill in a Tx ring entry */ |
568 | 568 | ||
569 | netdev_dbg(dev, "TX pkt type 0x%04x from %pM to %pM data 0x%08x len %d\n", | 569 | netdev_dbg(dev, "TX pkt type 0x%04x from %pM to %pM data %p len %u\n", |
570 | ((u_short *)skb->data)[6], | 570 | ((u_short *)skb->data)[6], |
571 | skb->data + 6, skb->data, | 571 | skb->data + 6, skb->data, |
572 | (int)skb->data, (int)skb->len); | 572 | skb->data, skb->len); |
573 | 573 | ||
574 | local_irq_save(flags); | 574 | local_irq_save(flags); |
575 | 575 | ||
diff --git a/drivers/net/ethernet/amd/atarilance.c b/drivers/net/ethernet/amd/atarilance.c index 70ed79c46245..84219df72f51 100644 --- a/drivers/net/ethernet/amd/atarilance.c +++ b/drivers/net/ethernet/amd/atarilance.c | |||
@@ -558,21 +558,18 @@ static unsigned long __init lance_probe1( struct net_device *dev, | |||
558 | printk( "Lance: request for irq %d failed\n", IRQ_AUTO_5 ); | 558 | printk( "Lance: request for irq %d failed\n", IRQ_AUTO_5 ); |
559 | return 0; | 559 | return 0; |
560 | } | 560 | } |
561 | dev->irq = (unsigned short)IRQ_AUTO_5; | 561 | dev->irq = IRQ_AUTO_5; |
562 | } | 562 | } |
563 | else { | 563 | else { |
564 | /* For VME-RieblCards, request a free VME int; | 564 | /* For VME-RieblCards, request a free VME int */ |
565 | * (This must be unsigned long, since dev->irq is short and the | 565 | unsigned int irq = atari_register_vme_int(); |
566 | * IRQ_MACHSPEC bit would be cut off...) | ||
567 | */ | ||
568 | unsigned long irq = atari_register_vme_int(); | ||
569 | if (!irq) { | 566 | if (!irq) { |
570 | printk( "Lance: request for VME interrupt failed\n" ); | 567 | printk( "Lance: request for VME interrupt failed\n" ); |
571 | return 0; | 568 | return 0; |
572 | } | 569 | } |
573 | if (request_irq(irq, lance_interrupt, IRQ_TYPE_PRIO, | 570 | if (request_irq(irq, lance_interrupt, IRQ_TYPE_PRIO, |
574 | "Riebl-VME Ethernet", dev)) { | 571 | "Riebl-VME Ethernet", dev)) { |
575 | printk( "Lance: request for irq %ld failed\n", irq ); | 572 | printk( "Lance: request for irq %u failed\n", irq ); |
576 | return 0; | 573 | return 0; |
577 | } | 574 | } |
578 | dev->irq = irq; | 575 | dev->irq = irq; |
diff --git a/drivers/scsi/atari_scsi.c b/drivers/scsi/atari_scsi.c index 04a154f87e3e..df740cbbaef4 100644 --- a/drivers/scsi/atari_scsi.c +++ b/drivers/scsi/atari_scsi.c | |||
@@ -572,7 +572,7 @@ static void falcon_get_lock(void) | |||
572 | } | 572 | } |
573 | 573 | ||
574 | 574 | ||
575 | int __init atari_scsi_detect(struct scsi_host_template *host) | 575 | static int __init atari_scsi_detect(struct scsi_host_template *host) |
576 | { | 576 | { |
577 | static int called = 0; | 577 | static int called = 0; |
578 | struct Scsi_Host *instance; | 578 | struct Scsi_Host *instance; |
@@ -724,7 +724,7 @@ int __init atari_scsi_detect(struct scsi_host_template *host) | |||
724 | return 1; | 724 | return 1; |
725 | } | 725 | } |
726 | 726 | ||
727 | int atari_scsi_release(struct Scsi_Host *sh) | 727 | static int atari_scsi_release(struct Scsi_Host *sh) |
728 | { | 728 | { |
729 | if (IS_A_TT()) | 729 | if (IS_A_TT()) |
730 | free_irq(IRQ_TT_MFP_SCSI, sh); | 730 | free_irq(IRQ_TT_MFP_SCSI, sh); |
@@ -734,17 +734,21 @@ int atari_scsi_release(struct Scsi_Host *sh) | |||
734 | return 1; | 734 | return 1; |
735 | } | 735 | } |
736 | 736 | ||
737 | void __init atari_scsi_setup(char *str, int *ints) | 737 | #ifndef MODULE |
738 | static int __init atari_scsi_setup(char *str) | ||
738 | { | 739 | { |
739 | /* Format of atascsi parameter is: | 740 | /* Format of atascsi parameter is: |
740 | * atascsi=<can_queue>,<cmd_per_lun>,<sg_tablesize>,<hostid>,<use_tags> | 741 | * atascsi=<can_queue>,<cmd_per_lun>,<sg_tablesize>,<hostid>,<use_tags> |
741 | * Defaults depend on TT or Falcon, hostid determined at run time. | 742 | * Defaults depend on TT or Falcon, hostid determined at run time. |
742 | * Negative values mean don't change. | 743 | * Negative values mean don't change. |
743 | */ | 744 | */ |
745 | int ints[6]; | ||
746 | |||
747 | get_options(str, ARRAY_SIZE(ints), ints); | ||
744 | 748 | ||
745 | if (ints[0] < 1) { | 749 | if (ints[0] < 1) { |
746 | printk("atari_scsi_setup: no arguments!\n"); | 750 | printk("atari_scsi_setup: no arguments!\n"); |
747 | return; | 751 | return 0; |
748 | } | 752 | } |
749 | 753 | ||
750 | if (ints[0] >= 1) { | 754 | if (ints[0] >= 1) { |
@@ -777,9 +781,14 @@ void __init atari_scsi_setup(char *str, int *ints) | |||
777 | setup_use_tagged_queuing = !!ints[5]; | 781 | setup_use_tagged_queuing = !!ints[5]; |
778 | } | 782 | } |
779 | #endif | 783 | #endif |
784 | |||
785 | return 1; | ||
780 | } | 786 | } |
781 | 787 | ||
782 | int atari_scsi_bus_reset(Scsi_Cmnd *cmd) | 788 | __setup("atascsi=", atari_scsi_setup); |
789 | #endif /* !MODULE */ | ||
790 | |||
791 | static int atari_scsi_bus_reset(Scsi_Cmnd *cmd) | ||
783 | { | 792 | { |
784 | int rv; | 793 | int rv; |
785 | struct NCR5380_hostdata *hostdata = | 794 | struct NCR5380_hostdata *hostdata = |
@@ -852,7 +861,7 @@ static void __init atari_scsi_reset_boot(void) | |||
852 | #endif | 861 | #endif |
853 | 862 | ||
854 | 863 | ||
855 | const char *atari_scsi_info(struct Scsi_Host *host) | 864 | static const char *atari_scsi_info(struct Scsi_Host *host) |
856 | { | 865 | { |
857 | /* atari_scsi_detect() is verbose enough... */ | 866 | /* atari_scsi_detect() is verbose enough... */ |
858 | static const char string[] = "Atari native SCSI"; | 867 | static const char string[] = "Atari native SCSI"; |
@@ -862,8 +871,9 @@ const char *atari_scsi_info(struct Scsi_Host *host) | |||
862 | 871 | ||
863 | #if defined(REAL_DMA) | 872 | #if defined(REAL_DMA) |
864 | 873 | ||
865 | unsigned long atari_scsi_dma_setup(struct Scsi_Host *instance, void *data, | 874 | static unsigned long atari_scsi_dma_setup(struct Scsi_Host *instance, |
866 | unsigned long count, int dir) | 875 | void *data, unsigned long count, |
876 | int dir) | ||
867 | { | 877 | { |
868 | unsigned long addr = virt_to_phys(data); | 878 | unsigned long addr = virt_to_phys(data); |
869 | 879 | ||
diff --git a/drivers/scsi/atari_scsi.h b/drivers/scsi/atari_scsi.h index efadb8d567c2..bd52df78b209 100644 --- a/drivers/scsi/atari_scsi.h +++ b/drivers/scsi/atari_scsi.h | |||
@@ -18,11 +18,6 @@ | |||
18 | /* (I_HAVE_OVERRUNS stuff removed) */ | 18 | /* (I_HAVE_OVERRUNS stuff removed) */ |
19 | 19 | ||
20 | #ifndef ASM | 20 | #ifndef ASM |
21 | int atari_scsi_detect (struct scsi_host_template *); | ||
22 | const char *atari_scsi_info (struct Scsi_Host *); | ||
23 | int atari_scsi_reset (Scsi_Cmnd *, unsigned int); | ||
24 | int atari_scsi_release (struct Scsi_Host *); | ||
25 | |||
26 | /* The values for CMD_PER_LUN and CAN_QUEUE are somehow arbitrary. Higher | 21 | /* The values for CMD_PER_LUN and CAN_QUEUE are somehow arbitrary. Higher |
27 | * values should work, too; try it! (but cmd_per_lun costs memory!) */ | 22 | * values should work, too; try it! (but cmd_per_lun costs memory!) */ |
28 | 23 | ||
diff --git a/drivers/usb/musb/musb_io.h b/drivers/usb/musb/musb_io.h index 1d5eda26fbd1..f7c1c8e2dc3f 100644 --- a/drivers/usb/musb/musb_io.h +++ b/drivers/usb/musb/musb_io.h | |||
@@ -40,7 +40,7 @@ | |||
40 | #if !defined(CONFIG_ARM) && !defined(CONFIG_SUPERH) \ | 40 | #if !defined(CONFIG_ARM) && !defined(CONFIG_SUPERH) \ |
41 | && !defined(CONFIG_AVR32) && !defined(CONFIG_PPC32) \ | 41 | && !defined(CONFIG_AVR32) && !defined(CONFIG_PPC32) \ |
42 | && !defined(CONFIG_PPC64) && !defined(CONFIG_BLACKFIN) \ | 42 | && !defined(CONFIG_PPC64) && !defined(CONFIG_BLACKFIN) \ |
43 | && !defined(CONFIG_MIPS) | 43 | && !defined(CONFIG_MIPS) && !defined(CONFIG_M68K) |
44 | static inline void readsl(const void __iomem *addr, void *buf, int len) | 44 | static inline void readsl(const void __iomem *addr, void *buf, int len) |
45 | { insl((unsigned long)addr, buf, len); } | 45 | { insl((unsigned long)addr, buf, len); } |
46 | static inline void readsw(const void __iomem *addr, void *buf, int len) | 46 | static inline void readsw(const void __iomem *addr, void *buf, int len) |