summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmit Jain <ajain@motorola.com>2014-02-06 17:31:30 -0600
committerJames Wylder <jwylder@motorola.com>2014-03-05 17:47:18 -0600
commitc27d3c8d12de2a0a85823f74c17faa4d3dd1230f (patch)
tree17da5e9fa09197f463dc06f32c11f4dfae89da4f
parent2855fb7b26ef2fb97edd7ca39f2d9fef3173ea3c (diff)
downloadolio-linux-3.10-c27d3c8d12de2a0a85823f74c17faa4d3dd1230f.tar.xz
olio-linux-3.10-c27d3c8d12de2a0a85823f74c17faa4d3dd1230f.zip
IKXCLOCK-209: Change M4 ALS driver to use new registration mechanism
Change-Id: I199db9a837a91ef47dc6df0b20c76896761f7a50 Reviewed-on: http://gerrit.pcs.mot.com/608929 SLTApproved: Slta Waiver <sltawvr@motorola.com> Tested-by: Jira Key <jirakey@motorola.com> Reviewed-by: Douglas Zobel <dzobel1@motorola.com> Submit-Approved: Jira Key <jirakey@motorola.com>
-rw-r--r--drivers/misc/m4sensorhub_als.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/misc/m4sensorhub_als.c b/drivers/misc/m4sensorhub_als.c
index ea8e20da467..92d6b2b6c19 100644
--- a/drivers/misc/m4sensorhub_als.c
+++ b/drivers/misc/m4sensorhub_als.c
@@ -142,9 +142,11 @@ static const struct attribute_group als_attribute_group = {
.attrs = als_attributes,
};
-static int als_driver_init(struct m4sensorhub_data *m4sensorhub)
+static int als_driver_init(struct init_calldata *p_arg)
{
int ret;
+ struct m4sensorhub_data *m4sensorhub = p_arg->p_m4sensorhub_data;
+
ret = m4sensorhub_irq_register(m4sensorhub,
M4SH_IRQ_LIGHTSENSOR_DATA_READY,
m4_handle_als_irq,
@@ -183,7 +185,8 @@ static int als_client_probe(struct platform_device *pdev)
goto free_mem;
}
misc_als_data = als_client_data;
- ret = m4sensorhub_register_initcall(als_driver_init);
+ ret = m4sensorhub_register_initcall(als_driver_init,
+ als_client_data);
if (ret < 0) {
KDEBUG(M4SH_ERROR, "Unable to register init function"
"for als client = %d\n", ret);