aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wan
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2012-03-05 08:52:04 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-03-08 14:47:01 -0500
commitac4e016df4bf57cdb100170c5cc057a15a9c96bd (patch)
tree78cdfd267a495345d53c5010ec2fa6dd96d39d42 /drivers/net/wan
parentc2f128a1fed866dca94d52b3f0b1e40726e2352a (diff)
NET: pc300, show version info from module init
Again, no need to do that from the pci probe function. Hmm, I noticed this driver is marked as BROKEN. Won't touch it more, it has to be converted to dynamic tty driver allocation first. Perhaps it is time to move it to staging? Signed-off-by: Jiri Slaby <jslaby@suse.cz> Cc: netdev@vger.kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/wan')
-rw-r--r--drivers/net/wan/pc300_drv.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/net/wan/pc300_drv.c b/drivers/net/wan/pc300_drv.c
index a6dd00de41a4..cb0f8d932b0c 100644
--- a/drivers/net/wan/pc300_drv.c
+++ b/drivers/net/wan/pc300_drv.c
@@ -3231,7 +3231,7 @@ static void plx_init(pc300_t * card)
3231 3231
3232} 3232}
3233 3233
3234static inline void show_version(void) 3234static void show_version(void)
3235{ 3235{
3236 char *rcsvers, *rcsdate, *tmp; 3236 char *rcsvers, *rcsdate, *tmp;
3237 3237
@@ -3412,16 +3412,10 @@ static void cpc_init_card(pc300_t * card)
3412static int __devinit 3412static int __devinit
3413cpc_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 3413cpc_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
3414{ 3414{
3415 static int first_time = 1;
3416 int err, eeprom_outdated = 0; 3415 int err, eeprom_outdated = 0;
3417 u16 device_id; 3416 u16 device_id;
3418 pc300_t *card; 3417 pc300_t *card;
3419 3418
3420 if (first_time) {
3421 first_time = 0;
3422 show_version();
3423 }
3424
3425 if ((err = pci_enable_device(pdev)) < 0) 3419 if ((err = pci_enable_device(pdev)) < 0)
3426 return err; 3420 return err;
3427 3421
@@ -3657,6 +3651,7 @@ static struct pci_driver cpc_driver = {
3657 3651
3658static int __init cpc_init(void) 3652static int __init cpc_init(void)
3659{ 3653{
3654 show_version();
3660 return pci_register_driver(&cpc_driver); 3655 return pci_register_driver(&cpc_driver);
3661} 3656}
3662 3657