Commit 099ddb53 authored by Olaf Hering's avatar Olaf Hering Committed by Linus Torvalds

[PATCH] request_irq: avoid slash in proc directory entries

A few users of request_irq pass a string with '/'.
As a result, ls -l /proc/irq/*/* will fail to list these entries.
Signed-off-by: default avatarOlaf Hering <olh@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e6617020
...@@ -90,7 +90,7 @@ static int maceps2_open(struct serio *dev) ...@@ -90,7 +90,7 @@ static int maceps2_open(struct serio *dev)
{ {
struct maceps2_data *data = (struct maceps2_data *)dev->port_data; struct maceps2_data *data = (struct maceps2_data *)dev->port_data;
if (request_irq(data->irq, maceps2_interrupt, 0, "PS/2 port", dev)) { if (request_irq(data->irq, maceps2_interrupt, 0, "PS2 port", dev)) {
printk(KERN_ERR "Could not allocate PS/2 IRQ\n"); printk(KERN_ERR "Could not allocate PS/2 IRQ\n");
return -EBUSY; return -EBUSY;
} }
......
...@@ -418,7 +418,7 @@ static int __init via_pmu_start(void) ...@@ -418,7 +418,7 @@ static int __init via_pmu_start(void)
} }
if (pmu_kind == PMU_KEYLARGO_BASED && gpio_irq != -1) { if (pmu_kind == PMU_KEYLARGO_BASED && gpio_irq != -1) {
if (request_irq(gpio_irq, gpio1_interrupt, 0, "GPIO1/ADB", (void *)0)) if (request_irq(gpio_irq, gpio1_interrupt, 0, "GPIO1 ADB", (void *)0))
printk(KERN_ERR "pmu: can't get irq %d (GPIO1)\n", gpio_irq); printk(KERN_ERR "pmu: can't get irq %d (GPIO1)\n", gpio_irq);
gpio_irq_enabled = 1; gpio_irq_enabled = 1;
} }
......
...@@ -263,7 +263,7 @@ static struct sv11_device *sv11_init(int iobase, int irq) ...@@ -263,7 +263,7 @@ static struct sv11_device *sv11_init(int iobase, int irq)
/* We want a fast IRQ for this device. Actually we'd like an even faster /* We want a fast IRQ for this device. Actually we'd like an even faster
IRQ ;) - This is one driver RtLinux is made for */ IRQ ;) - This is one driver RtLinux is made for */
if(request_irq(irq, &z8530_interrupt, SA_INTERRUPT, "Hostess SV/11", dev)<0) if(request_irq(irq, &z8530_interrupt, SA_INTERRUPT, "Hostess SV11", dev)<0)
{ {
printk(KERN_WARNING "hostess: IRQ %d already in use.\n", irq); printk(KERN_WARNING "hostess: IRQ %d already in use.\n", irq);
goto fail1; goto fail1;
......
...@@ -57,7 +57,7 @@ extern unsigned char pckbd_sysrq_xlate[128]; ...@@ -57,7 +57,7 @@ extern unsigned char pckbd_sysrq_xlate[128];
#define AUX_IRQ 12 #define AUX_IRQ 12
#define aux_request_irq(hand, dev_id) \ #define aux_request_irq(hand, dev_id) \
request_irq(AUX_IRQ, hand, SA_SHIRQ, "PS/2 Mouse", dev_id) request_irq(AUX_IRQ, hand, SA_SHIRQ, "PS2 Mouse", dev_id)
#define aux_free_irq(dev_id) free_irq(AUX_IRQ, dev_id) #define aux_free_irq(dev_id) free_irq(AUX_IRQ, dev_id)
......
...@@ -65,7 +65,7 @@ extern unsigned char pckbd_sysrq_xlate[128]; ...@@ -65,7 +65,7 @@ extern unsigned char pckbd_sysrq_xlate[128];
#endif #endif
#define aux_request_irq(hand, dev_id) \ #define aux_request_irq(hand, dev_id) \
request_irq(AUX_IRQ, hand, SA_SHIRQ, "PS/2 Mouse", dev_id) request_irq(AUX_IRQ, hand, SA_SHIRQ, "PS2 Mouse", dev_id)
#define aux_free_irq(dev_id) free_irq(AUX_IRQ, dev_id) #define aux_free_irq(dev_id) free_irq(AUX_IRQ, dev_id)
......
...@@ -711,7 +711,7 @@ static int __devinit snd_opl3sa2_probe(int dev, ...@@ -711,7 +711,7 @@ static int __devinit snd_opl3sa2_probe(int dev,
chip->single_dma = 1; chip->single_dma = 1;
if ((err = snd_opl3sa2_detect(chip)) < 0) if ((err = snd_opl3sa2_detect(chip)) < 0)
goto __error; goto __error;
if (request_irq(xirq, snd_opl3sa2_interrupt, SA_INTERRUPT, "OPL3-SA2/3", (void *)chip)) { if (request_irq(xirq, snd_opl3sa2_interrupt, SA_INTERRUPT, "OPL3-SA2", (void *)chip)) {
snd_printk(KERN_ERR "opl3sa2: can't grab IRQ %d\n", xirq); snd_printk(KERN_ERR "opl3sa2: can't grab IRQ %d\n", xirq);
err = -ENODEV; err = -ENODEV;
goto __error; goto __error;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment