From 9a4d2fce48c33ef2779f103605e688d3839a06a0 Mon Sep 17 00:00:00 2001 From: Tzafrir Cohen Date: Tue, 20 Feb 2018 19:07:50 +0200 Subject: [PATCH] xpp: init_card: eeprom_release_201 applies to any 20x * The variable eeprom_release_201 was added in the initialization script of the FXS module to add a case where it is different from 101 mains. * However, it tests for "201" and it should apply for any 20x. * Remove the variable from the init script of module type 6 (new FXS) as it was not used. Signed-off-by: Tzafrir Cohen --- drivers/dahdi/xpp/init_card_1_30 | 2 +- drivers/dahdi/xpp/init_card_6_30 | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/dahdi/xpp/init_card_1_30 b/drivers/dahdi/xpp/init_card_1_30 index e0e3485..7251ca9 100755 --- a/drivers/dahdi/xpp/init_card_1_30 +++ b/drivers/dahdi/xpp/init_card_1_30 @@ -94,7 +94,7 @@ if (-t STDERR) { } } logit "XBUS_MODEL_STRING='$ENV{XBUS_MODEL_STRING}'"; - if ($ENV{XBUS_MODEL_STRING} =~ m{.*/.*/201}) { + if ($ENV{XBUS_MODEL_STRING} =~ m{.*/.*/20.}) { $eeprom_release_201 = 1; } $chipregs = sprintf "/sys/bus/xpds/devices/%02d:%1d:0/chipregs", diff --git a/drivers/dahdi/xpp/init_card_6_30 b/drivers/dahdi/xpp/init_card_6_30 index 977c9f7..dcf9179 100755 --- a/drivers/dahdi/xpp/init_card_6_30 +++ b/drivers/dahdi/xpp/init_card_6_30 @@ -51,7 +51,6 @@ BEGIN { $init_dir = dirname($0); unshift(@INC, "$init_dir"); } use XppConfig $init_dir; my $unit_id; my %opts; -my $eeprom_release_201 = 0; getopts('o:', \%opts); @@ -96,9 +95,6 @@ if (-t STDERR) { } } logit "XBUS_MODEL_STRING='$ENV{XBUS_MODEL_STRING}'"; - if ($ENV{XBUS_MODEL_STRING} =~ m{.*/.*/201}) { - $eeprom_release_201 = 1; - } $chipregs = sprintf "/sys/bus/xpds/devices/%02d:%1d:0/chipregs", $ENV{XBUS_NUMBER}, $ENV{UNIT_NUMBER}; $command = "/proc/xpp/$ENV{XBUS_NAME}/command";