dahdi: Do not save the irq information.

If the user needs this information, there are better ways to get it than
having it embedded in the device / span structures.

Signed-off-by: Shaun Ruffell <sruffell@digium.com>

10 files changed, 2 insertions, 12 deletions

diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c
index e351217..1d14d4c 100644
--- a/drivers/dahdi/dahdi-base.c
+++ b/drivers/dahdi/dahdi-base.c
@@ -4164,7 +4164,7 @@ static int dahdi_ioctl_spanstat(struct file *file, unsigned long data)
 	}
 	spaninfo.lbo = s->lbo;
 	spaninfo.lineconfig = s->lineconfig;
-	spaninfo.irq = s->parent->irq;
+	spaninfo.irq = 0;
 	spaninfo.linecompat = s->linecompat;
 	strlcpy(spaninfo.lboname, dahdi_lboname(s->lbo),
 			  sizeof(spaninfo.lboname));
@@ -4251,7 +4251,7 @@ static int dahdi_ioctl_spanstat_v1(struct file *file, unsigned long data)
 	}
 	spaninfo_v1.lbo = s->lbo;
 	spaninfo_v1.lineconfig = s->lineconfig;
-	spaninfo_v1.irq = s->parent->irq;
+	spaninfo_v1.irq = 0;
 	spaninfo_v1.linecompat = s->linecompat;
 	strlcpy(spaninfo_v1.lboname,
 			  dahdi_lboname(s->lbo),
diff --git a/drivers/dahdi/tor2.c b/drivers/dahdi/tor2.c
index 3de7f06..32e8435 100644
--- a/drivers/dahdi/tor2.c
+++ b/drivers/dahdi/tor2.c
@@ -329,7 +329,6 @@ static int __devinit tor2_launch(struct tor2 *tor)
 				       tor->pci->bus->number,
 				       PCI_SLOT(tor->pci->devfn) + 1);
 
-	tor->ddev->irq = tor->pci->irq;
 	if (!tor->ddev->location)
 		return -ENOMEM;
 
diff --git a/drivers/dahdi/wcb4xxp/base.c b/drivers/dahdi/wcb4xxp/base.c
index 7e80400..f085679 100644
--- a/drivers/dahdi/wcb4xxp/base.c
+++ b/drivers/dahdi/wcb4xxp/base.c
@@ -2934,7 +2934,6 @@ static int __devinit b4xx_probe(struct pci_dev *pdev, const struct pci_device_id
 
 	b4->ddev->manufacturer = "Digium";
 	b4->ddev->devicetype = b4->variety;
-	b4->ddev->irq = b4->pdev->irq;
 	b4->ddev->location = kasprintf(GFP_KERNEL, "PCI Bus %02d Slot %02d",
 				       b4->pdev->bus->number,
 				       PCI_SLOT(b4->pdev->devfn) + 1);
diff --git a/drivers/dahdi/wcfxo.c b/drivers/dahdi/wcfxo.c
index fcfea9d..b22586b 100644
--- a/drivers/dahdi/wcfxo.c
+++ b/drivers/dahdi/wcfxo.c
@@ -662,7 +662,6 @@ static int wcfxo_initialize(struct wcfxo *wc)
 
 	wc->ddev->manufacturer = "Digium";
 	wc->ddev->devicetype = wc->variety;
-	wc->ddev->irq = wc->dev->irq;
 	wc->chan->sigcap = DAHDI_SIG_FXSKS | DAHDI_SIG_FXSLS | DAHDI_SIG_SF;
 	wc->chan->chanpos = 1;
 	wc->span.chans = &wc->chan;
diff --git a/drivers/dahdi/wct1xxp.c b/drivers/dahdi/wct1xxp.c
index 56e8b55..0e4d13d 100644
--- a/drivers/dahdi/wct1xxp.c
+++ b/drivers/dahdi/wct1xxp.c
@@ -777,7 +777,6 @@ static int t1xxp_software_init(struct t1xxp *wc)
 	snprintf(wc->span.desc, sizeof(wc->span.desc) - 1, "%s Card %d", wc->variety, wc->num);
 	wc->ddev->manufacturer = "Digium";
 	wc->ddev->devicetype = wc->variety;
-	wc->ddev->irq = wc->dev->irq;
 	wc->ddev->location = kasprintf(GFP_KERNEL, "PCI Bus %02d Slot %02d",
 				      wc->dev->bus->number,
 				      PCI_SLOT(wc->dev->devfn) + 1);
diff --git a/drivers/dahdi/wctdm.c b/drivers/dahdi/wctdm.c
index bd3c5b1..2a15dbc 100644
--- a/drivers/dahdi/wctdm.c
+++ b/drivers/dahdi/wctdm.c
@@ -2399,7 +2399,6 @@ static int wctdm_initialize(struct wctdm *wc)
 	wc->ddev = dahdi_create_device();
 	if (!wc->ddev)
 		return -ENOMEM;
-	wc->ddev->irq = wc->dev->irq;
 	list_add_tail(&wc->span.device_node, &wc->ddev->spans);
 	if (dahdi_register_device(wc->ddev, &wc->dev->dev)) {
 		printk(KERN_NOTICE "Unable to register span with DAHDI\n");
diff --git a/drivers/dahdi/wctdm24xxp/base.c b/drivers/dahdi/wctdm24xxp/base.c
index babac2e..ebe386f 100644
--- a/drivers/dahdi/wctdm24xxp/base.c
+++ b/drivers/dahdi/wctdm24xxp/base.c
@@ -5495,7 +5495,6 @@ __wctdm_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 #endif
 	wc->ddev = dahdi_create_device();
 	wc->ddev->manufacturer = "Digium";
-	wc->ddev->irq = pdev->irq;
 	wc->ddev->location = kasprintf(GFP_KERNEL, "PCI%s Bus %02d Slot %02d",
 				       (wc->desc->flags & FLAG_EXPRESS) ?
 						" Express" : "",
diff --git a/drivers/dahdi/wcte11xp.c b/drivers/dahdi/wcte11xp.c
index 03d2f05..4283e8d 100644
--- a/drivers/dahdi/wcte11xp.c
+++ b/drivers/dahdi/wcte11xp.c
@@ -981,7 +981,6 @@ static int t1xxp_software_init(struct t1 *wc)
 
 	t4_serial_setup(wc);
 	wc->num = x;
-	wc->ddev->irq = wc->dev->irq;
 	sprintf(wc->span.name, "WCT1/%d", wc->num);
 	snprintf(wc->span.desc, sizeof(wc->span.desc) - 1, "%s Card %d", wc->variety, wc->num);
 	wc->ddev->manufacturer = "Digium";
diff --git a/drivers/dahdi/wcte12xp/base.c b/drivers/dahdi/wcte12xp/base.c
index 67100dc..dec6e8f 100644
--- a/drivers/dahdi/wcte12xp/base.c
+++ b/drivers/dahdi/wcte12xp/base.c
@@ -2283,7 +2283,6 @@ static int __devinit te12xp_init_one(struct pci_dev *pdev, const struct pci_devi
 	INIT_LIST_HEAD(&wc->active_cmds);
 	INIT_LIST_HEAD(&wc->pending_cmds);
 
-	wc->ddev->irq = pdev->irq;
 	wc->variety = d->name;
 	wc->txident = 1;
 
diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h
index c1f5b49..bded00b 100644
--- a/include/dahdi/kernel.h
+++ b/include/dahdi/kernel.h
@@ -887,7 +887,6 @@ struct dahdi_span_ops {
  * @location:	The location of this device
  * @devicetype: What type of device this is.
  * @irqmisses:  Count of "interrupt misses" for this device.
- * @irq:	The interrupt line (if any) for this device.
  *
  */
 struct dahdi_device {
@@ -897,7 +896,6 @@ struct dahdi_device {
 	const char *devicetype;
 	struct device dev;
 	unsigned int irqmisses;
-	u8 irq;
 };
 
 struct dahdi_span {