Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de7eb617 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "esoc: Modify probe to include driver instance"

parents 0b90867d 7e81da85

drivers/esoc/esoc-mdm-drv.c

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -203,7 +203,7 @@ static int mdm_register_ssr(struct esoc_clink *esoc_clink) 
	return esoc_clink_register_ssr(esoc_clink);

}



int esoc_ssr_probe(struct esoc_clink *esoc_clink)

int esoc_ssr_probe(struct esoc_clink *esoc_clink, struct esoc_drv *drv)

{

	int ret;

	struct mdm_drv *mdm_drv;

drivers/esoc/esoc.h

+3 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -112,7 +112,8 @@ struct esoc_drv { 
	struct module *owner;

	struct esoc_compat *compat_table;

	unsigned int compat_entries;

	int (*probe)(struct esoc_clink *esoc_clink);

	int (*probe)(struct esoc_clink *esoc_clink,

				struct esoc_drv *drv);

};



#define to_esoc_clink(d) container_of(d, struct esoc_clink, dev)

drivers/esoc/esoc_bus.c

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -60,7 +60,7 @@ static int esoc_bus_probe(struct device *dev) 
	struct esoc_clink *esoc_clink = to_esoc_clink(dev);

	struct esoc_drv *esoc_drv = to_esoc_drv(dev->driver);



	ret = esoc_drv->probe(esoc_clink);

	ret = esoc_drv->probe(esoc_clink, esoc_drv);

	if (ret) {

		pr_err("failed to probe %s dev\n", esoc_clink->name);

		return ret;