@@ -45,7 +45,7 @@ struct event_dev {
45
45
static irqreturn_t events_interrupt (int irq , void * dev_id )
46
46
{
47
47
struct event_dev * edev = dev_id ;
48
- unsigned type , code , value ;
48
+ unsigned int type , code , value ;
49
49
50
50
type = __raw_readl (edev -> addr + REG_READ );
51
51
code = __raw_readl (edev -> addr + REG_READ );
@@ -57,7 +57,7 @@ static irqreturn_t events_interrupt(int irq, void *dev_id)
57
57
}
58
58
59
59
static void events_import_bits (struct event_dev * edev ,
60
- unsigned long bits [], unsigned type , size_t count )
60
+ unsigned long bits [], unsigned int type , size_t count )
61
61
{
62
62
void __iomem * addr = edev -> addr ;
63
63
int i , j ;
@@ -99,6 +99,7 @@ static void events_import_abs_params(struct event_dev *edev)
99
99
100
100
for (j = 0 ; j < ARRAY_SIZE (val ); j ++ ) {
101
101
int offset = (i * ARRAY_SIZE (val ) + j ) * sizeof (u32 );
102
+
102
103
val [j ] = __raw_readl (edev -> addr + REG_DATA + offset );
103
104
}
104
105
@@ -112,7 +113,7 @@ static int events_probe(struct platform_device *pdev)
112
113
struct input_dev * input_dev ;
113
114
struct event_dev * edev ;
114
115
struct resource * res ;
115
- unsigned keymapnamelen ;
116
+ unsigned int keymapnamelen ;
116
117
void __iomem * addr ;
117
118
int irq ;
118
119
int i ;
@@ -150,7 +151,7 @@ static int events_probe(struct platform_device *pdev)
150
151
for (i = 0 ; i < keymapnamelen ; i ++ )
151
152
edev -> name [i ] = __raw_readb (edev -> addr + REG_DATA + i );
152
153
153
- pr_debug ("events_probe() keymap=%s\n" , edev -> name );
154
+ pr_debug ("%s: keymap=%s\n" , __func__ , edev -> name );
154
155
155
156
input_dev -> name = edev -> name ;
156
157
input_dev -> id .bustype = BUS_HOST ;
0 commit comments