aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorKrzysztof Hałasa <khc@pm.waw.pl>2008-07-09 15:30:17 -0400
committerKrzysztof Hałasa <khc@pm.waw.pl>2008-11-21 20:49:48 -0500
commit967834361a4beb3bbd3069189c192dc6fdeef8a9 (patch)
tree5ab9b849a283891f16208426aa7c3c7f3be6e526 /drivers
parent0954ed826921bcf11352e05a58d598c493e6bdfb (diff)
WAN: don't print HD64572 driver versions anymore.
Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wan/pc300too.c14
-rw-r--r--drivers/net/wan/pci200syn.c14
2 files changed, 2 insertions, 26 deletions
diff --git a/drivers/net/wan/pc300too.c b/drivers/net/wan/pc300too.c
index 289c5fe65194..9b42199d4f83 100644
--- a/drivers/net/wan/pc300too.c
+++ b/drivers/net/wan/pc300too.c
@@ -37,9 +37,6 @@
37 37
38#include "hd64572.h" 38#include "hd64572.h"
39 39
40static const char* version = "Cyclades PC300 driver version: 1.17";
41static const char* devname = "PC300";
42
43#undef DEBUG_PKT 40#undef DEBUG_PKT
44#define DEBUG_RINGS 41#define DEBUG_RINGS
45 42
@@ -316,12 +313,6 @@ static int __devinit pc300_pci_init_one(struct pci_dev *pdev,
316 u32 scaphys; /* SCA memory base */ 313 u32 scaphys; /* SCA memory base */
317 u32 plxphys; /* PLX registers memory base */ 314 u32 plxphys; /* PLX registers memory base */
318 315
319#ifndef MODULE
320 static int printed_version;
321 if (!printed_version++)
322 printk(KERN_INFO "%s\n", version);
323#endif
324
325 i = pci_enable_device(pdev); 316 i = pci_enable_device(pdev);
326 if (i) 317 if (i)
327 return i; 318 return i;
@@ -444,7 +435,7 @@ static int __devinit pc300_pci_init_one(struct pci_dev *pdev,
444 writew(0x0041, &card->plxbase->intr_ctrl_stat); 435 writew(0x0041, &card->plxbase->intr_ctrl_stat);
445 436
446 /* Allocate IRQ */ 437 /* Allocate IRQ */
447 if (request_irq(pdev->irq, sca_intr, IRQF_SHARED, devname, card)) { 438 if (request_irq(pdev->irq, sca_intr, IRQF_SHARED, "pc300", card)) {
448 printk(KERN_WARNING "pc300: could not allocate IRQ%d.\n", 439 printk(KERN_WARNING "pc300: could not allocate IRQ%d.\n",
449 pdev->irq); 440 pdev->irq);
450 pc300_pci_remove_one(pdev); 441 pc300_pci_remove_one(pdev);
@@ -522,9 +513,6 @@ static struct pci_driver pc300_pci_driver = {
522 513
523static int __init pc300_init_module(void) 514static int __init pc300_init_module(void)
524{ 515{
525#ifdef MODULE
526 printk(KERN_INFO "%s\n", version);
527#endif
528 if (pci_clock_freq < 1000000 || pci_clock_freq > 80000000) { 516 if (pci_clock_freq < 1000000 || pci_clock_freq > 80000000) {
529 printk(KERN_ERR "pc300: Invalid PCI clock frequency\n"); 517 printk(KERN_ERR "pc300: Invalid PCI clock frequency\n");
530 return -EINVAL; 518 return -EINVAL;
diff --git a/drivers/net/wan/pci200syn.c b/drivers/net/wan/pci200syn.c
index bfcf4f67b4c0..a16311a79e9a 100644
--- a/drivers/net/wan/pci200syn.c
+++ b/drivers/net/wan/pci200syn.c
@@ -33,9 +33,6 @@
33 33
34#include "hd64572.h" 34#include "hd64572.h"
35 35
36static const char* version = "Goramo PCI200SYN driver version: 1.16";
37static const char* devname = "PCI200SYN";
38
39#undef DEBUG_PKT 36#undef DEBUG_PKT
40#define DEBUG_RINGS 37#define DEBUG_RINGS
41 38
@@ -294,12 +291,6 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev,
294 u32 scaphys; /* SCA memory base */ 291 u32 scaphys; /* SCA memory base */
295 u32 plxphys; /* PLX registers memory base */ 292 u32 plxphys; /* PLX registers memory base */
296 293
297#ifndef MODULE
298 static int printed_version;
299 if (!printed_version++)
300 printk(KERN_INFO "%s\n", version);
301#endif
302
303 i = pci_enable_device(pdev); 294 i = pci_enable_device(pdev);
304 if (i) 295 if (i)
305 return i; 296 return i;
@@ -396,7 +387,7 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev,
396 writew(readw(p) | 0x0040, p); 387 writew(readw(p) | 0x0040, p);
397 388
398 /* Allocate IRQ */ 389 /* Allocate IRQ */
399 if (request_irq(pdev->irq, sca_intr, IRQF_SHARED, devname, card)) { 390 if (request_irq(pdev->irq, sca_intr, IRQF_SHARED, "pci200syn", card)) {
400 printk(KERN_WARNING "pci200syn: could not allocate IRQ%d.\n", 391 printk(KERN_WARNING "pci200syn: could not allocate IRQ%d.\n",
401 pdev->irq); 392 pdev->irq);
402 pci200_pci_remove_one(pdev); 393 pci200_pci_remove_one(pdev);
@@ -462,9 +453,6 @@ static struct pci_driver pci200_pci_driver = {
462 453
463static int __init pci200_init_module(void) 454static int __init pci200_init_module(void)
464{ 455{
465#ifdef MODULE
466 printk(KERN_INFO "%s\n", version);
467#endif
468 if (pci_clock_freq < 1000000 || pci_clock_freq > 80000000) { 456 if (pci_clock_freq < 1000000 || pci_clock_freq > 80000000) {
469 printk(KERN_ERR "pci200syn: Invalid PCI clock frequency\n"); 457 printk(KERN_ERR "pci200syn: Invalid PCI clock frequency\n");
470 return -EINVAL; 458 return -EINVAL;