diff options
Diffstat (limited to 'drivers/input/keyboard')
-rw-r--r-- | drivers/input/keyboard/sh_keysc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/keyboard/sh_keysc.c b/drivers/input/keyboard/sh_keysc.c index 076111fc72d2..25706f802258 100644 --- a/drivers/input/keyboard/sh_keysc.c +++ b/drivers/input/keyboard/sh_keysc.c | |||
@@ -36,6 +36,8 @@ static const struct { | |||
36 | [SH_KEYSC_MODE_1] = { 0, 6, 5 }, | 36 | [SH_KEYSC_MODE_1] = { 0, 6, 5 }, |
37 | [SH_KEYSC_MODE_2] = { 1, 5, 6 }, | 37 | [SH_KEYSC_MODE_2] = { 1, 5, 6 }, |
38 | [SH_KEYSC_MODE_3] = { 2, 4, 7 }, | 38 | [SH_KEYSC_MODE_3] = { 2, 4, 7 }, |
39 | [SH_KEYSC_MODE_4] = { 3, 6, 6 }, | ||
40 | [SH_KEYSC_MODE_5] = { 4, 6, 7 }, | ||
39 | }; | 41 | }; |
40 | 42 | ||
41 | struct sh_keysc_priv { | 43 | struct sh_keysc_priv { |
@@ -122,8 +124,6 @@ static irqreturn_t sh_keysc_isr(int irq, void *dev_id) | |||
122 | return IRQ_HANDLED; | 124 | return IRQ_HANDLED; |
123 | } | 125 | } |
124 | 126 | ||
125 | #define res_size(res) ((res)->end - (res)->start + 1) | ||
126 | |||
127 | static int __devinit sh_keysc_probe(struct platform_device *pdev) | 127 | static int __devinit sh_keysc_probe(struct platform_device *pdev) |
128 | { | 128 | { |
129 | struct sh_keysc_priv *priv; | 129 | struct sh_keysc_priv *priv; |
@@ -164,7 +164,7 @@ static int __devinit sh_keysc_probe(struct platform_device *pdev) | |||
164 | memcpy(&priv->pdata, pdev->dev.platform_data, sizeof(priv->pdata)); | 164 | memcpy(&priv->pdata, pdev->dev.platform_data, sizeof(priv->pdata)); |
165 | pdata = &priv->pdata; | 165 | pdata = &priv->pdata; |
166 | 166 | ||
167 | priv->iomem_base = ioremap_nocache(res->start, res_size(res)); | 167 | priv->iomem_base = ioremap_nocache(res->start, resource_size(res)); |
168 | if (priv->iomem_base == NULL) { | 168 | if (priv->iomem_base == NULL) { |
169 | dev_err(&pdev->dev, "failed to remap I/O memory\n"); | 169 | dev_err(&pdev->dev, "failed to remap I/O memory\n"); |
170 | error = -ENXIO; | 170 | error = -ENXIO; |