diff options
author | Roman Kiryanov <rkir@google.com> | 2018-05-31 20:03:33 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-06-04 16:36:26 -0400 |
commit | 8f6a652a8c1379023775709e3db6c6f7c1bdb2ab (patch) | |
tree | ab4a04ff4fc55aaf9de2d9cfcf2a4f49f628a239 /drivers | |
parent | 45615a9baf4661f953887988eeb4de69fd6cd96e (diff) |
Input: goldfish_events - fix checkpatch warnings
Address issues pointed by checkpatch.pl
Signed-off-by: Roman Kiryanov <rkir@google.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/input/keyboard/goldfish_events.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/input/keyboard/goldfish_events.c b/drivers/input/keyboard/goldfish_events.c index f6e643b589b6..e8dae6195b30 100644 --- a/drivers/input/keyboard/goldfish_events.c +++ b/drivers/input/keyboard/goldfish_events.c | |||
@@ -45,7 +45,7 @@ struct event_dev { | |||
45 | static irqreturn_t events_interrupt(int irq, void *dev_id) | 45 | static irqreturn_t events_interrupt(int irq, void *dev_id) |
46 | { | 46 | { |
47 | struct event_dev *edev = dev_id; | 47 | struct event_dev *edev = dev_id; |
48 | unsigned type, code, value; | 48 | unsigned int type, code, value; |
49 | 49 | ||
50 | type = __raw_readl(edev->addr + REG_READ); | 50 | type = __raw_readl(edev->addr + REG_READ); |
51 | code = __raw_readl(edev->addr + REG_READ); | 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 | static void events_import_bits(struct event_dev *edev, | 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 | void __iomem *addr = edev->addr; | 62 | void __iomem *addr = edev->addr; |
63 | int i, j; | 63 | int i, j; |
@@ -99,6 +99,7 @@ static void events_import_abs_params(struct event_dev *edev) | |||
99 | 99 | ||
100 | for (j = 0; j < ARRAY_SIZE(val); j++) { | 100 | for (j = 0; j < ARRAY_SIZE(val); j++) { |
101 | int offset = (i * ARRAY_SIZE(val) + j) * sizeof(u32); | 101 | int offset = (i * ARRAY_SIZE(val) + j) * sizeof(u32); |
102 | |||
102 | val[j] = __raw_readl(edev->addr + REG_DATA + offset); | 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 | struct input_dev *input_dev; | 113 | struct input_dev *input_dev; |
113 | struct event_dev *edev; | 114 | struct event_dev *edev; |
114 | struct resource *res; | 115 | struct resource *res; |
115 | unsigned keymapnamelen; | 116 | unsigned int keymapnamelen; |
116 | void __iomem *addr; | 117 | void __iomem *addr; |
117 | int irq; | 118 | int irq; |
118 | int i; | 119 | int i; |
@@ -150,7 +151,7 @@ static int events_probe(struct platform_device *pdev) | |||
150 | for (i = 0; i < keymapnamelen; i++) | 151 | for (i = 0; i < keymapnamelen; i++) |
151 | edev->name[i] = __raw_readb(edev->addr + REG_DATA + i); | 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 | input_dev->name = edev->name; | 156 | input_dev->name = edev->name; |
156 | input_dev->id.bustype = BUS_HOST; | 157 | input_dev->id.bustype = BUS_HOST; |