Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit b9e066942981c6de3897de94953bea295ae18ec8

Authored by Ameya Palande
Committed by Matthew Garrett
1 parent 020036678e
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

platform/x86: Simplify intel_mid_powerbtn 

This patch:
1. Removes unnecessay #defines
2. Removes 'mfld_pb_priv' data structure which results in simpler error
   handling and less memory allocations.

Signed-off-by: Ameya Palande <2ameya@gmail.com>
Signed-off-by: Matthew Garrett <mjg@redhat.com>

Showing 1 changed file with 30 additions and 42 deletions Side-by-side Diff

drivers/platform/x86/intel_mid_powerbtn.c
Diff comments   View file @ b9e0669
... ... @@ -23,58 +23,48 @@
23 23 #include <linux/slab.h>
24 24 #include <linux/platform_device.h>
25 25 #include <linux/input.h>
  26 +
26 27 #include <asm/intel_scu_ipc.h>
27 28  
28 29 #define DRIVER_NAME "msic_power_btn"
29 30  
30   -#define MSIC_IRQ_STAT 0x02
31   - #define MSIC_IRQ_PB (1 << 0)
32   -#define MSIC_PB_CONFIG 0x3e
33 31 #define MSIC_PB_STATUS 0x3f
34   - #define MSIC_PB_LEVEL (1 << 3) /* 1 - release, 0 - press */
  32 +#define MSIC_PB_LEVEL (1 << 3) /* 1 - release, 0 - press */
35 33  
36   -struct mfld_pb_priv {
37   - struct input_dev *input;
38   - unsigned int irq;
39   -};
40   -
41 34 static irqreturn_t mfld_pb_isr(int irq, void *dev_id)
42 35 {
43   - struct mfld_pb_priv *priv = dev_id;
  36 + struct input_dev *input = dev_id;
44 37 int ret;
45 38 u8 pbstat;
46 39  
47 40 ret = intel_scu_ipc_ioread8(MSIC_PB_STATUS, &pbstat);
48   - if (ret < 0)
49   - return IRQ_HANDLED;
  41 + if (ret < 0) {
  42 + dev_err(input->dev.parent, "Read error %d while reading"
  43 + " MSIC_PB_STATUS\n", ret);
  44 + } else {
  45 + input_event(input, EV_KEY, KEY_POWER,
  46 + !(pbstat & MSIC_PB_LEVEL));
  47 + input_sync(input);
  48 + }
50 49  
51   - input_event(priv->input, EV_KEY, KEY_POWER, !(pbstat & MSIC_PB_LEVEL));
52   - input_sync(priv->input);
53   -
54 50 return IRQ_HANDLED;
55 51 }
56 52  
57 53 static int __devinit mfld_pb_probe(struct platform_device *pdev)
58 54 {
59   - struct mfld_pb_priv *priv;
60 55 struct input_dev *input;
61   - int irq;
  56 + int irq = platform_get_irq(pdev, 0);
62 57 int error;
63 58  
64   - irq = platform_get_irq(pdev, 0);
65 59 if (irq < 0)
66 60 return -EINVAL;
67 61  
68   - priv = kzalloc(sizeof(struct mfld_pb_priv), GFP_KERNEL);
69 62 input = input_allocate_device();
70   - if (!priv || !input) {
71   - error = -ENOMEM;
72   - goto err_free_mem;
  63 + if (!input) {
  64 + dev_err(&pdev->dev, "Input device allocation error\n");
  65 + return -ENOMEM;
73 66 }
74 67  
75   - priv->input = input;
76   - priv->irq = irq;
77   -
78 68 input->name = pdev->name;
79 69 input->phys = "power-button/input0";
80 70 input->id.bustype = BUS_HOST;
81 71  
82 72  
83 73  
84 74  
85 75  
86 76  
87 77  
88 78  
... ... @@ -82,42 +72,40 @@
82 72  
83 73 input_set_capability(input, EV_KEY, KEY_POWER);
84 74  
85   - error = request_threaded_irq(priv->irq, NULL, mfld_pb_isr,
86   - 0, DRIVER_NAME, priv);
  75 + error = request_threaded_irq(irq, NULL, mfld_pb_isr, 0,
  76 + DRIVER_NAME, input);
87 77 if (error) {
88   - dev_err(&pdev->dev,
89   - "unable to request irq %d for mfld power button\n",
90   - irq);
91   - goto err_free_mem;
  78 + dev_err(&pdev->dev, "Unable to request irq %d for mfld power"
  79 + "button\n", irq);
  80 + goto err_free_input;
92 81 }
93 82  
94 83 error = input_register_device(input);
95 84 if (error) {
96   - dev_err(&pdev->dev,
97   - "unable to register input dev, error %d\n", error);
  85 + dev_err(&pdev->dev, "Unable to register input dev, error "
  86 + "%d\n", error);
98 87 goto err_free_irq;
99 88 }
100 89  
101   - platform_set_drvdata(pdev, priv);
  90 + platform_set_drvdata(pdev, input);
102 91 return 0;
103 92  
104 93 err_free_irq:
105   - free_irq(priv->irq, priv);
106   -err_free_mem:
  94 + free_irq(irq, input);
  95 +err_free_input:
107 96 input_free_device(input);
108   - kfree(priv);
109 97 return error;
110 98 }
111 99  
112 100 static int __devexit mfld_pb_remove(struct platform_device *pdev)
113 101 {
114   - struct mfld_pb_priv *priv = platform_get_drvdata(pdev);
  102 + struct input_dev *input = platform_get_drvdata(pdev);
  103 + int irq = platform_get_irq(pdev, 0);
115 104  
116   - free_irq(priv->irq, priv);
117   - input_unregister_device(priv->input);
118   - kfree(priv);
119   -
  105 + free_irq(irq, input);
  106 + input_unregister_device(input);
120 107 platform_set_drvdata(pdev, NULL);
  108 +
121 109 return 0;
122 110 }
123 111