aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/atlx
diff options
context:
space:
mode:
authorChris Snook <csnook@redhat.com>2008-04-18 21:47:41 -0400
committerJeff Garzik <jgarzik@redhat.com>2008-04-25 02:08:51 -0400
commit3b49f0354561aefc5235b8dd6ee4ae779a26e06b (patch)
treea84e2fb2087cb14eba105b71dd52d6ea6bfd7305 /drivers/net/atlx
parente3152ab901bcec132639d123b0e7c2b5ed237957 (diff)
atlx: remove flash vendor parameter
There's no good reason to manually set the flash vendor in a module parameter, outside of an Atheros hardware lab. Remove it, so nobody accidentally bricks their board using it incorrectly. Signed-off-by: Chris Snook <csnook@redhat.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net/atlx')
-rw-r--r--drivers/net/atlx/atlx.c39
1 files changed, 0 insertions, 39 deletions
diff --git a/drivers/net/atlx/atlx.c b/drivers/net/atlx/atlx.c
index 4186326d1b94..b7bf70ef3b63 100644
--- a/drivers/net/atlx/atlx.c
+++ b/drivers/net/atlx/atlx.c
@@ -278,30 +278,10 @@ module_param_array_named(int_mod_timer, int_mod_timer, int,
278 &num_int_mod_timer, 0); 278 &num_int_mod_timer, 0);
279MODULE_PARM_DESC(int_mod_timer, "Interrupt moderator timer"); 279MODULE_PARM_DESC(int_mod_timer, "Interrupt moderator timer");
280 280
281/*
282 * flash_vendor
283 *
284 * Valid Range: 0-2
285 *
286 * 0 - Atmel
287 * 1 - SST
288 * 2 - ST
289 *
290 * Default Value: 0
291 */
292static int __devinitdata flash_vendor[ATL1_MAX_NIC+1] = ATL1_PARAM_INIT;
293static int num_flash_vendor;
294module_param_array_named(flash_vendor, flash_vendor, int, &num_flash_vendor, 0);
295MODULE_PARM_DESC(flash_vendor, "SPI flash vendor");
296
297#define DEFAULT_INT_MOD_CNT 100 /* 200us */ 281#define DEFAULT_INT_MOD_CNT 100 /* 200us */
298#define MAX_INT_MOD_CNT 65000 282#define MAX_INT_MOD_CNT 65000
299#define MIN_INT_MOD_CNT 50 283#define MIN_INT_MOD_CNT 50
300 284
301#define FLASH_VENDOR_DEFAULT 0
302#define FLASH_VENDOR_MIN 0
303#define FLASH_VENDOR_MAX 2
304
305struct atl1_option { 285struct atl1_option {
306 enum { enable_option, range_option, list_option } type; 286 enum { enable_option, range_option, list_option } type;
307 char *name; 287 char *name;
@@ -409,25 +389,6 @@ void __devinit atl1_check_options(struct atl1_adapter *adapter)
409 } else 389 } else
410 adapter->imt = (u16) (opt.def); 390 adapter->imt = (u16) (opt.def);
411 } 391 }
412
413 { /* Flash Vendor */
414 struct atl1_option opt = {
415 .type = range_option,
416 .name = "SPI Flash Vendor",
417 .err = "using default of "
418 __MODULE_STRING(FLASH_VENDOR_DEFAULT),
419 .def = DEFAULT_INT_MOD_CNT,
420 .arg = {.r = {.min = FLASH_VENDOR_MIN,
421 .max = FLASH_VENDOR_MAX} }
422 };
423 int val;
424 if (num_flash_vendor > bd) {
425 val = flash_vendor[bd];
426 atl1_validate_option(&val, &opt, pdev);
427 adapter->hw.flash_vendor = (u8) val;
428 } else
429 adapter->hw.flash_vendor = (u8) (opt.def);
430 }
431} 392}
432 393
433#endif /* ATLX_C */ 394#endif /* ATLX_C */