Unified module parameters style to new one for 2.6.x kernels.

[lincan.git] / lincan / src / bfadcan.c

diff --git a/lincan/src/bfadcan.c b/lincan/src/bfadcan.c
index f6d831b70f2e08d53a042bff5a8917eb8e63e4c5..f04fe9fd69f666942f0058030c76fb40ae597f34 100644 (file)
--- a/lincan/src/bfadcan.c
+++ b/lincan/src/bfadcan.c
@@ -23,8 +23,7 @@
 #define __NO_VERSION__
 #include <linux/module.h>
 
-long clock_freq;
-MODULE_PARM(clock_freq,"i");
+#define CAN_BFAD_CLOCKFREQ 20000000
 
 /* cli and sti are not allowed in 2.5.5x SMP kernels */
 #ifdef WINDOWED_ACCESS
@@ -197,7 +196,8 @@ int bfadcan_init_chip_data(struct candevice_t *candev, int chipnr)
        unsigned int id1, id2;
        sja1000p_fill_chipspecops(candev->chip[chipnr]);
        candev->chip[chipnr]->chip_base_addr=candev->io_addr;
-       candev->chip[chipnr]->clock = clock_freq;
+       if(candev->chip[chipnr]->clock<=0)
+               candev->chip[chipnr]->clock = CAN_BFAD_CLOCKFREQ;
        candev->chip[chipnr]->sja_cdr_reg = sjaCDR_CBP | sjaCDR_CLK_OFF;
        candev->chip[chipnr]->sja_ocr_reg = sjaOCR_MODE_NORMAL | sjaOCR_TX0_LH;
        id1 = inb(0xe284);