|
@@ -86,8 +86,8 @@ static struct platform_driver omap_hdq_driver = {
|
|
|
static u8 omap_w1_read_byte(void *_hdq);
|
|
|
static void omap_w1_write_byte(void *_hdq, u8 byte);
|
|
|
static u8 omap_w1_reset_bus(void *_hdq);
|
|
|
-static void omap_w1_search_bus(void *_hdq, u8 search_type,
|
|
|
- w1_slave_found_callback slave_found);
|
|
|
+static void omap_w1_search_bus(void *_hdq, struct w1_master *master_dev,
|
|
|
+ u8 search_type, w1_slave_found_callback slave_found);
|
|
|
|
|
|
|
|
|
static struct w1_bus_master omap_w1_master = {
|
|
@@ -231,8 +231,8 @@ static u8 omap_w1_reset_bus(void *_hdq)
|
|
|
}
|
|
|
|
|
|
/* W1 search callback function */
|
|
|
-static void omap_w1_search_bus(void *_hdq, u8 search_type,
|
|
|
- w1_slave_found_callback slave_found)
|
|
|
+static void omap_w1_search_bus(void *_hdq, struct w1_master *master_dev,
|
|
|
+ u8 search_type, w1_slave_found_callback slave_found)
|
|
|
{
|
|
|
u64 module_id, rn_le, cs, id;
|
|
|
|
|
@@ -249,7 +249,7 @@ static void omap_w1_search_bus(void *_hdq, u8 search_type,
|
|
|
cs = w1_calc_crc8((u8 *)&rn_le, 7);
|
|
|
id = (cs << 56) | module_id;
|
|
|
|
|
|
- slave_found(_hdq, id);
|
|
|
+ slave_found(master_dev, id);
|
|
|
}
|
|
|
|
|
|
static int _omap_hdq_reset(struct hdq_data *hdq_data)
|