aboutsummaryrefslogtreecommitdiff
path: root/arch/sparc64
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2007-07-11 23:22:55 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2007-07-16 04:04:24 -0700
commit133f09a169f3022be3de671b29658b7ecb375022 (patch)
treec30e7d34eceb96dd1b0d2b999713bc99f74efbdd /arch/sparc64
parente450992d13ffaec6dde4bbbd308b834ae9fc3708 (diff)
downloadlinux-2.6.34-ux500-133f09a169f3022be3de671b29658b7ecb375022.tar.gz
[SPARC64]: Use more mearningful names for IRQ registry.
All of the interrupts say "LDX RX" and "LDX TX" currently which is next to useless. Put a device specific prefix before "RX" and "TX" instead which makes it much more useful. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc64')
-rw-r--r--arch/sparc64/kernel/ds.c2
-rw-r--r--arch/sparc64/kernel/ldc.c16
-rw-r--r--arch/sparc64/kernel/viohs.c2
3 files changed, 15 insertions, 5 deletions
diff --git a/arch/sparc64/kernel/ds.c b/arch/sparc64/kernel/ds.c
index 22517dfd021..c7ece8c5203 100644
--- a/arch/sparc64/kernel/ds.c
+++ b/arch/sparc64/kernel/ds.c
@@ -598,7 +598,7 @@ static int __devinit ds_probe(struct vio_dev *vdev,
}
dp->lp = lp;
- err = ldc_bind(lp);
+ err = ldc_bind(lp, "DS");
if (err)
goto out_free_ldc;
diff --git a/arch/sparc64/kernel/ldc.c b/arch/sparc64/kernel/ldc.c
index 4cba2868596..dbb65b674a6 100644
--- a/arch/sparc64/kernel/ldc.c
+++ b/arch/sparc64/kernel/ldc.c
@@ -158,6 +158,10 @@ struct ldc_channel {
u8 mss;
u8 state;
+#define LDC_IRQ_NAME_MAX 32
+ char rx_irq_name[LDC_IRQ_NAME_MAX];
+ char tx_irq_name[LDC_IRQ_NAME_MAX];
+
struct hlist_head mh_list;
struct hlist_node list;
@@ -1226,25 +1230,31 @@ EXPORT_SYMBOL(ldc_free);
* state. This does not initiate a handshake, ldc_connect() does
* that.
*/
-int ldc_bind(struct ldc_channel *lp)
+int ldc_bind(struct ldc_channel *lp, const char *name)
{
unsigned long hv_err, flags;
int err = -EINVAL;
spin_lock_irqsave(&lp->lock, flags);
+ if (!name)
+ goto out_err;
+
if (lp->state != LDC_STATE_INIT)
goto out_err;
+ snprintf(lp->rx_irq_name, LDC_IRQ_NAME_MAX, "%s RX", name);
+ snprintf(lp->tx_irq_name, LDC_IRQ_NAME_MAX, "%s TX", name);
+
err = request_irq(lp->cfg.rx_irq, ldc_rx,
IRQF_SAMPLE_RANDOM | IRQF_SHARED,
- "LDC RX", lp);
+ lp->rx_irq_name, lp);
if (err)
goto out_err;
err = request_irq(lp->cfg.tx_irq, ldc_tx,
IRQF_SAMPLE_RANDOM | IRQF_SHARED,
- "LDC TX", lp);
+ lp->tx_irq_name, lp);
if (err)
goto out_free_rx_irq;
diff --git a/arch/sparc64/kernel/viohs.c b/arch/sparc64/kernel/viohs.c
index 3eb42e3624f..b0b1b877934 100644
--- a/arch/sparc64/kernel/viohs.c
+++ b/arch/sparc64/kernel/viohs.c
@@ -724,7 +724,7 @@ void vio_port_up(struct vio_driver_state *vio)
err = 0;
if (state == LDC_STATE_INIT) {
- err = ldc_bind(vio->lp);
+ err = ldc_bind(vio->lp, vio->name);
if (err)
printk(KERN_WARNING "%s: Port %lu bind failed, "
"err=%d\n",