aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/atm/solos-pci.c23
1 files changed, 0 insertions, 23 deletions
diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
index bf59c407fec9..2ef81575378d 100644
--- a/drivers/atm/solos-pci.c
+++ b/drivers/atm/solos-pci.c
@@ -70,7 +70,6 @@
70 70
71#define RX_DMA_SIZE 2048 71#define RX_DMA_SIZE 2048
72 72
73static int debug = 0;
74static int atmdebug = 0; 73static int atmdebug = 0;
75static int firmware_upgrade = 0; 74static int firmware_upgrade = 0;
76static int fpga_upgrade = 0; 75static int fpga_upgrade = 0;
@@ -133,11 +132,9 @@ MODULE_AUTHOR("Traverse Technologies <support@traverse.com.au>");
133MODULE_DESCRIPTION("Solos PCI driver"); 132MODULE_DESCRIPTION("Solos PCI driver");
134MODULE_VERSION(VERSION); 133MODULE_VERSION(VERSION);
135MODULE_LICENSE("GPL"); 134MODULE_LICENSE("GPL");
136MODULE_PARM_DESC(debug, "Enable Loopback");
137MODULE_PARM_DESC(atmdebug, "Print ATM data"); 135MODULE_PARM_DESC(atmdebug, "Print ATM data");
138MODULE_PARM_DESC(firmware_upgrade, "Initiate Solos firmware upgrade"); 136MODULE_PARM_DESC(firmware_upgrade, "Initiate Solos firmware upgrade");
139MODULE_PARM_DESC(fpga_upgrade, "Initiate FPGA upgrade"); 137MODULE_PARM_DESC(fpga_upgrade, "Initiate FPGA upgrade");
140module_param(debug, int, 0444);
141module_param(atmdebug, int, 0644); 138module_param(atmdebug, int, 0644);
142module_param(firmware_upgrade, int, 0444); 139module_param(firmware_upgrade, int, 0444);
143module_param(fpga_upgrade, int, 0444); 140module_param(fpga_upgrade, int, 0444);
@@ -974,26 +971,12 @@ static int fpga_tx(struct solos_card *card)
974static int psend(struct atm_vcc *vcc, struct sk_buff *skb) 971static int psend(struct atm_vcc *vcc, struct sk_buff *skb)
975{ 972{
976 struct solos_card *card = vcc->dev->dev_data; 973 struct solos_card *card = vcc->dev->dev_data;
977 struct sk_buff *skb2 = NULL;
978 struct pkt_hdr *header; 974 struct pkt_hdr *header;
979 int pktlen; 975 int pktlen;
980 976
981 //dev_dbg(&card->dev->dev, "psend called.\n"); 977 //dev_dbg(&card->dev->dev, "psend called.\n");
982 //dev_dbg(&card->dev->dev, "dev,vpi,vci = %d,%d,%d\n",SOLOS_CHAN(vcc->dev),vcc->vpi,vcc->vci); 978 //dev_dbg(&card->dev->dev, "dev,vpi,vci = %d,%d,%d\n",SOLOS_CHAN(vcc->dev),vcc->vpi,vcc->vci);
983 979
984 if (debug) {
985 skb2 = atm_alloc_charge(vcc, skb->len, GFP_ATOMIC);
986 if (skb2) {
987 memcpy(skb2->data, skb->data, skb->len);
988 skb_put(skb2, skb->len);
989 vcc->push(vcc, skb2);
990 atomic_inc(&vcc->stats->rx);
991 }
992 atomic_inc(&vcc->stats->tx);
993 solos_pop(vcc, skb);
994 return 0;
995 }
996
997 pktlen = skb->len; 980 pktlen = skb->len;
998 if (pktlen > (BUF_SIZE - sizeof(*header))) { 981 if (pktlen > (BUF_SIZE - sizeof(*header))) {
999 dev_warn(&card->dev->dev, "Length of PDU is too large. Dropping PDU.\n"); 982 dev_warn(&card->dev->dev, "Length of PDU is too large. Dropping PDU.\n");
@@ -1052,9 +1035,6 @@ static int fpga_probe(struct pci_dev *dev, const struct pci_device_id *id)
1052 uint32_t data32; 1035 uint32_t data32;
1053 struct solos_card *card; 1036 struct solos_card *card;
1054 1037
1055 if (debug)
1056 return 0;
1057
1058 card = kzalloc(sizeof(*card), GFP_KERNEL); 1038 card = kzalloc(sizeof(*card), GFP_KERNEL);
1059 if (!card) 1039 if (!card)
1060 return -ENOMEM; 1040 return -ENOMEM;
@@ -1256,9 +1236,6 @@ static void fpga_remove(struct pci_dev *dev)
1256{ 1236{
1257 struct solos_card *card = pci_get_drvdata(dev); 1237 struct solos_card *card = pci_get_drvdata(dev);
1258 1238
1259 if (debug)
1260 return;
1261
1262 atm_remove(card); 1239 atm_remove(card);
1263 1240
1264 dev_vdbg(&dev->dev, "Freeing IRQ\n"); 1241 dev_vdbg(&dev->dev, "Freeing IRQ\n");