diff options
-rw-r--r-- | drivers/ieee1394/eth1394.c | 8 | ||||
-rw-r--r-- | drivers/ieee1394/ohci1394.c | 8 | ||||
-rw-r--r-- | drivers/ieee1394/sbp2.c | 5 |
3 files changed, 0 insertions, 21 deletions
diff --git a/drivers/ieee1394/eth1394.c b/drivers/ieee1394/eth1394.c index c9e92d85c893..6984a921b59b 100644 --- a/drivers/ieee1394/eth1394.c +++ b/drivers/ieee1394/eth1394.c | |||
@@ -88,9 +88,6 @@ | |||
88 | printk(KERN_ERR "%s:%s[%d]: " fmt "\n", driver_name, __FUNCTION__, __LINE__, ## args) | 88 | printk(KERN_ERR "%s:%s[%d]: " fmt "\n", driver_name, __FUNCTION__, __LINE__, ## args) |
89 | #define TRACE() printk(KERN_ERR "%s:%s[%d] ---- TRACE\n", driver_name, __FUNCTION__, __LINE__) | 89 | #define TRACE() printk(KERN_ERR "%s:%s[%d] ---- TRACE\n", driver_name, __FUNCTION__, __LINE__) |
90 | 90 | ||
91 | static char version[] __devinitdata = | ||
92 | "$Rev: 1312 $ Ben Collins <bcollins@debian.org>"; | ||
93 | |||
94 | struct fragment_info { | 91 | struct fragment_info { |
95 | struct list_head list; | 92 | struct list_head list; |
96 | int offset; | 93 | int offset; |
@@ -566,7 +563,6 @@ static void ether1394_add_host (struct hpsb_host *host) | |||
566 | struct eth1394_host_info *hi = NULL; | 563 | struct eth1394_host_info *hi = NULL; |
567 | struct net_device *dev = NULL; | 564 | struct net_device *dev = NULL; |
568 | struct eth1394_priv *priv; | 565 | struct eth1394_priv *priv; |
569 | static int version_printed = 0; | ||
570 | u64 fifo_addr; | 566 | u64 fifo_addr; |
571 | 567 | ||
572 | if (!(host->config_roms & HPSB_CONFIG_ROM_ENTRY_IP1394)) | 568 | if (!(host->config_roms & HPSB_CONFIG_ROM_ENTRY_IP1394)) |
@@ -581,9 +577,6 @@ static void ether1394_add_host (struct hpsb_host *host) | |||
581 | if (fifo_addr == ~0ULL) | 577 | if (fifo_addr == ~0ULL) |
582 | goto out; | 578 | goto out; |
583 | 579 | ||
584 | if (version_printed++ == 0) | ||
585 | ETH1394_PRINT_G (KERN_INFO, "%s\n", version); | ||
586 | |||
587 | /* We should really have our own alloc_hpsbdev() function in | 580 | /* We should really have our own alloc_hpsbdev() function in |
588 | * net_init.c instead of calling the one for ethernet then hijacking | 581 | * net_init.c instead of calling the one for ethernet then hijacking |
589 | * it for ourselves. That way we'd be a real networking device. */ | 582 | * it for ourselves. That way we'd be a real networking device. */ |
@@ -1768,7 +1761,6 @@ fail: | |||
1768 | static void ether1394_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) | 1761 | static void ether1394_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) |
1769 | { | 1762 | { |
1770 | strcpy (info->driver, driver_name); | 1763 | strcpy (info->driver, driver_name); |
1771 | strcpy (info->version, "$Rev: 1312 $"); | ||
1772 | /* FIXME XXX provide sane businfo */ | 1764 | /* FIXME XXX provide sane businfo */ |
1773 | strcpy (info->bus_info, "ieee1394"); | 1765 | strcpy (info->bus_info, "ieee1394"); |
1774 | } | 1766 | } |
diff --git a/drivers/ieee1394/ohci1394.c b/drivers/ieee1394/ohci1394.c index dcb5776e5c44..8355068b0696 100644 --- a/drivers/ieee1394/ohci1394.c +++ b/drivers/ieee1394/ohci1394.c | |||
@@ -161,9 +161,6 @@ printk(level "%s: " fmt "\n" , OHCI1394_DRIVER_NAME , ## args) | |||
161 | #define PRINT(level, fmt, args...) \ | 161 | #define PRINT(level, fmt, args...) \ |
162 | printk(level "%s: fw-host%d: " fmt "\n" , OHCI1394_DRIVER_NAME, ohci->host->id , ## args) | 162 | printk(level "%s: fw-host%d: " fmt "\n" , OHCI1394_DRIVER_NAME, ohci->host->id , ## args) |
163 | 163 | ||
164 | static char version[] __devinitdata = | ||
165 | "$Rev: 1313 $ Ben Collins <bcollins@debian.org>"; | ||
166 | |||
167 | /* Module Parameters */ | 164 | /* Module Parameters */ |
168 | static int phys_dma = 1; | 165 | static int phys_dma = 1; |
169 | module_param(phys_dma, int, 0644); | 166 | module_param(phys_dma, int, 0644); |
@@ -3215,15 +3212,10 @@ do { \ | |||
3215 | static int __devinit ohci1394_pci_probe(struct pci_dev *dev, | 3212 | static int __devinit ohci1394_pci_probe(struct pci_dev *dev, |
3216 | const struct pci_device_id *ent) | 3213 | const struct pci_device_id *ent) |
3217 | { | 3214 | { |
3218 | static int version_printed = 0; | ||
3219 | |||
3220 | struct hpsb_host *host; | 3215 | struct hpsb_host *host; |
3221 | struct ti_ohci *ohci; /* shortcut to currently handled device */ | 3216 | struct ti_ohci *ohci; /* shortcut to currently handled device */ |
3222 | unsigned long ohci_base; | 3217 | unsigned long ohci_base; |
3223 | 3218 | ||
3224 | if (version_printed++ == 0) | ||
3225 | PRINT_G(KERN_INFO, "%s", version); | ||
3226 | |||
3227 | if (pci_enable_device(dev)) | 3219 | if (pci_enable_device(dev)) |
3228 | FAIL(-ENXIO, "Failed to enable OHCI hardware"); | 3220 | FAIL(-ENXIO, "Failed to enable OHCI hardware"); |
3229 | pci_set_master(dev); | 3221 | pci_set_master(dev); |
diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c index 073ede9d3b48..b871116fa4d1 100644 --- a/drivers/ieee1394/sbp2.c +++ b/drivers/ieee1394/sbp2.c | |||
@@ -80,9 +80,6 @@ | |||
80 | #include "ieee1394_transactions.h" | 80 | #include "ieee1394_transactions.h" |
81 | #include "sbp2.h" | 81 | #include "sbp2.h" |
82 | 82 | ||
83 | static char version[] __devinitdata = | ||
84 | "$Rev: 1306 $ Ben Collins <bcollins@debian.org>"; | ||
85 | |||
86 | /* | 83 | /* |
87 | * Module load parameter definitions | 84 | * Module load parameter definitions |
88 | */ | 85 | */ |
@@ -2696,8 +2693,6 @@ static int sbp2_module_init(void) | |||
2696 | 2693 | ||
2697 | SBP2_DEBUG("sbp2_module_init"); | 2694 | SBP2_DEBUG("sbp2_module_init"); |
2698 | 2695 | ||
2699 | printk(KERN_INFO "sbp2: %s\n", version); | ||
2700 | |||
2701 | /* Module load debug option to force one command at a time (serializing I/O) */ | 2696 | /* Module load debug option to force one command at a time (serializing I/O) */ |
2702 | if (serialize_io) { | 2697 | if (serialize_io) { |
2703 | SBP2_INFO("Driver forced to serialize I/O (serialize_io=1)"); | 2698 | SBP2_INFO("Driver forced to serialize I/O (serialize_io=1)"); |