Skip to content

Commit

Permalink
Input: usb1400_ts - add __devinit/__devexit section annotations
Browse files Browse the repository at this point in the history
Add __devinit/__devexit sections annotations so parts of code could be
discarded after completing driver initialization.

Acked-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
  • Loading branch information
Dmitry Torokhov committed Jan 5, 2012
1 parent 8028e93 commit 9fea929
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions drivers/input/touchscreen/ucb1400_ts.c
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ static void ucb1400_ts_close(struct input_dev *idev)
* Try to probe our interrupt, rather than relying on lots of
* hard-coded machine dependencies.
*/
static int ucb1400_ts_detect_irq(struct ucb1400_ts *ucb)
static int __devinit ucb1400_ts_detect_irq(struct ucb1400_ts *ucb)
{
unsigned long mask, timeout;

Expand Down Expand Up @@ -342,7 +342,7 @@ static int ucb1400_ts_detect_irq(struct ucb1400_ts *ucb)
return 0;
}

static int ucb1400_ts_probe(struct platform_device *dev)
static int __devinit ucb1400_ts_probe(struct platform_device *dev)
{
int error, x_res, y_res;
u16 fcsr;
Expand Down Expand Up @@ -416,15 +416,15 @@ static int ucb1400_ts_probe(struct platform_device *dev)
input_free_device(ucb->ts_idev);
err:
return error;

}

static int ucb1400_ts_remove(struct platform_device *dev)
static int __devexit ucb1400_ts_remove(struct platform_device *dev)
{
struct ucb1400_ts *ucb = dev->dev.platform_data;

free_irq(ucb->irq, ucb);
input_unregister_device(ucb->ts_idev);

return 0;
}

Expand All @@ -450,7 +450,7 @@ static SIMPLE_DEV_PM_OPS(ucb1400_ts_pm_ops, NULL, ucb1400_ts_resume);

static struct platform_driver ucb1400_ts_driver = {
.probe = ucb1400_ts_probe,
.remove = ucb1400_ts_remove,
.remove = __devexit_p(ucb1400_ts_remove),
.driver = {
.name = "ucb1400_ts",
.owner = THIS_MODULE,
Expand Down

0 comments on commit 9fea929

Please sign in to comment.