diff options
| author | Vikas Jain <vjain@nvidia.com> | 2013-01-18 12:07:23 +0530 |
|---|---|---|
| committer | Riham Haidar <rhaidar@nvidia.com> | 2013-01-22 14:06:30 -0800 |
| commit | 1293fbcebba2a07f378f6747678864a5ffba017f (patch) | |
| tree | 6e4b79993a4da773309d1af6d3bca6132a7cac81 /drivers | |
| parent | cd0829b4f2894212c40043df830fe05f2d230891 (diff) | |
input: touch: atmel: Update Ftrace logging.
Renamed touchscreen ftrace event to reflect
hardware module it is tracing. With this change,
each touchscreen hardware will have seperate
ftrace events.
Bug 1170830.
Change-Id: I45ffb3a264d958c9732d89bd2b5d4d62a9640267
Signed-off-by: Vikas Jain <vjain@nvidia.com>
Reviewed-on: http://git-master/r/192314
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Robert Collins <rcollins@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/input/touchscreen/atmel_mxt_ts.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c index d287d4ff0219..6a81a63690d7 100644 --- a/drivers/input/touchscreen/atmel_mxt_ts.c +++ b/drivers/input/touchscreen/atmel_mxt_ts.c @@ -3,7 +3,7 @@ * * Copyright (C) 2010 Samsung Electronics Co.Ltd * Copyright (C) 2011 Atmel Corporation - * Copyright (C) 2011-2012 NVIDIA Corporation + * Copyright (C) 2011-2013 NVIDIA Corporation * Author: Joonyoung Shim <jy0922.shim@samsung.com> * * This program is free software; you can redistribute it and/or modify it @@ -25,7 +25,7 @@ #include <linux/regulator/consumer.h> #define CREATE_TRACE_POINTS -#include <trace/events/nvevent.h> +#include <trace/events/touchscreen_atmel.h> /* Version */ #define MXT_VER_20 20 @@ -1141,7 +1141,7 @@ update_count: static irqreturn_t mxt_interrupt(int irq, void *dev_id) { struct mxt_data *data = dev_id; - trace_nvevent_irq_data_read_start_series("Atmel_mxt_interrupt"); + trace_touchscreen_atmel_irq("Atmel_mxt_interrupt"); if (data->T44_address) return mxt_read_messages_t44(data); else @@ -2586,7 +2586,7 @@ err_free_object: err_disable_regulator: regulator_disable(data->regulator_avdd); regulator_disable(data->regulator_vdd); -err_free_data: + kfree(data); return error; } |