projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
w83627ehf: Fix unchecked return status
[powerpc.git]
/
drivers
/
char
/
stallion.c
diff --git
a/drivers/char/stallion.c
b/drivers/char/stallion.c
index
0f7a542
..
3beb220
100644
(file)
--- a/
drivers/char/stallion.c
+++ b/
drivers/char/stallion.c
@@
-26,7
+26,6
@@
/*****************************************************************************/
/*****************************************************************************/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/slab.h>
#include <linux/interrupt.h>
#include <linux/module.h>
#include <linux/slab.h>
#include <linux/interrupt.h>
@@
-708,7
+707,7
@@
static unsigned int sc26198_baudtable[] = {
* Define the driver info for a user level control device. Used mainly
* to get at port stats - only not using the port device itself.
*/
* Define the driver info for a user level control device. Used mainly
* to get at port stats - only not using the port device itself.
*/
-static
struct file_operations
stl_fsiomem = {
+static
const struct file_operations
stl_fsiomem = {
.owner = THIS_MODULE,
.ioctl = stl_memioctl,
};
.owner = THIS_MODULE,
.ioctl = stl_memioctl,
};
@@
-2303,7
+2302,7
@@
static inline int stl_initeio(stlbrd_t *brdp)
brdp->nrpanels = 1;
brdp->state |= BRD_FOUND;
brdp->hwid = status;
brdp->nrpanels = 1;
brdp->state |= BRD_FOUND;
brdp->hwid = status;
- if (request_irq(brdp->irq, stl_intr,
SA_SHIRQ
, name, brdp) != 0) {
+ if (request_irq(brdp->irq, stl_intr,
IRQF_SHARED
, name, brdp) != 0) {
printk("STALLION: failed to register interrupt "
"routine for %s irq=%d\n", name, brdp->irq);
rc = -ENODEV;
printk("STALLION: failed to register interrupt "
"routine for %s irq=%d\n", name, brdp->irq);
rc = -ENODEV;
@@
-2513,7
+2512,7
@@
static inline int stl_initech(stlbrd_t *brdp)
outb((brdp->ioctrlval | ECH_BRDDISABLE), brdp->ioctrl);
brdp->state |= BRD_FOUND;
outb((brdp->ioctrlval | ECH_BRDDISABLE), brdp->ioctrl);
brdp->state |= BRD_FOUND;
- if (request_irq(brdp->irq, stl_intr,
SA_SHIRQ
, name, brdp) != 0) {
+ if (request_irq(brdp->irq, stl_intr,
IRQF_SHARED
, name, brdp) != 0) {
printk("STALLION: failed to register interrupt "
"routine for %s irq=%d\n", name, brdp->irq);
i = -ENODEV;
printk("STALLION: failed to register interrupt "
"routine for %s irq=%d\n", name, brdp->irq);
i = -ENODEV;