xmm626_sec_modem_hci_power: pass the ipc_client struct

This enables to use logging inside xmm626_sec_modem_hci_power.

At this point the ipc_client struct is already available,
so it is safe to do that.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>

6 files changed, 18 insertions, 18 deletions

diff --git a/samsung-ipc/devices/galaxys2/galaxys2.c b/samsung-ipc/devices/galaxys2/galaxys2.c
index f74d17c..2e6b037 100644
--- a/samsung-ipc/devices/galaxys2/galaxys2.c
+++ b/samsung-ipc/devices/galaxys2/galaxys2.c
@@ -77,7 +77,7 @@ int galaxys2_boot(struct ipc_client *client)
 
     rc = xmm626_sec_modem_power(client, modem_boot_fd, 0);
     rc |= xmm626_sec_modem_link_control_enable(modem_link_fd, 0);
-    rc |= xmm626_sec_modem_hci_power(0);
+    rc |= xmm626_sec_modem_hci_power(client, 0);
     rc |= xmm626_sec_modem_link_control_active(modem_link_fd, 0);
 
     if (rc < 0) {
@@ -88,7 +88,7 @@ int galaxys2_boot(struct ipc_client *client)
 
     rc = xmm626_sec_modem_power(client, modem_boot_fd, 1);
     rc |= xmm626_sec_modem_link_control_enable(modem_link_fd, 1);
-    rc |= xmm626_sec_modem_hci_power(1);
+    rc |= xmm626_sec_modem_hci_power(client, 1);
     rc |= xmm626_sec_modem_link_control_active(modem_link_fd, 1);
 
     if (rc < 0) {
@@ -180,7 +180,7 @@ int galaxys2_boot(struct ipc_client *client)
     }
 
     rc = xmm626_sec_modem_link_control_enable(modem_link_fd, 0);
-    rc |= xmm626_sec_modem_hci_power(0);
+    rc |= xmm626_sec_modem_hci_power(client, 0);
     rc |= xmm626_sec_modem_link_control_active(modem_link_fd, 0);
 
     if (rc < 0) {
@@ -196,7 +196,7 @@ int galaxys2_boot(struct ipc_client *client)
     ipc_client_log(client, "Waited for host wake");
 
     rc = xmm626_sec_modem_link_control_enable(modem_link_fd, 1);
-    rc |= xmm626_sec_modem_hci_power(1);
+    rc |= xmm626_sec_modem_hci_power(client, 1);
     rc |= xmm626_sec_modem_link_control_active(modem_link_fd, 1);
 
     if (rc < 0) {
diff --git a/samsung-ipc/devices/i9300/i9300.c b/samsung-ipc/devices/i9300/i9300.c
index f55f8e9..f4c3a8d 100644
--- a/samsung-ipc/devices/i9300/i9300.c
+++ b/samsung-ipc/devices/i9300/i9300.c
@@ -75,7 +75,7 @@ int i9300_boot(struct ipc_client *client)
     }
     ipc_client_log(client, "Opened modem link device");
 
-    rc = xmm626_sec_modem_hci_power(0);
+    rc = xmm626_sec_modem_hci_power(client, 0);
     if (rc < 0) {
         ipc_client_log(client, "Turning the modem off failed");
         goto error;
@@ -83,7 +83,7 @@ int i9300_boot(struct ipc_client *client)
     ipc_client_log(client, "Turned the modem off");
 
     rc = xmm626_sec_modem_power(client, modem_boot_fd, 1);
-    rc |= xmm626_sec_modem_hci_power(1);
+    rc |= xmm626_sec_modem_hci_power(client, 1);
 
     if (rc < 0) {
         ipc_client_log(client, "Turning the modem on failed");
@@ -174,7 +174,7 @@ int i9300_boot(struct ipc_client *client)
     }
 
     rc = xmm626_sec_modem_link_control_enable(modem_link_fd, 0);
-    rc |= xmm626_sec_modem_hci_power(0);
+    rc |= xmm626_sec_modem_hci_power(client, 0);
     rc |= xmm626_sec_modem_link_control_active(modem_link_fd, 0);
 
     if (rc < 0) {
@@ -190,7 +190,7 @@ int i9300_boot(struct ipc_client *client)
     ipc_client_log(client, "Waited for host wake");
 
     rc = xmm626_sec_modem_link_control_enable(modem_link_fd, 1);
-    rc |= xmm626_sec_modem_hci_power(1);
+    rc |= xmm626_sec_modem_hci_power(client, 1);
     rc |= xmm626_sec_modem_link_control_active(modem_link_fd, 1);
 
     if (rc < 0) {
diff --git a/samsung-ipc/devices/n5100/n5100.c b/samsung-ipc/devices/n5100/n5100.c
index b9bc2b5..af69627 100644
--- a/samsung-ipc/devices/n5100/n5100.c
+++ b/samsung-ipc/devices/n5100/n5100.c
@@ -76,7 +76,7 @@ int n5100_boot(struct ipc_client *client)
     }
     ipc_client_log(client, "Opened modem link device");
 
-    rc = xmm626_sec_modem_hci_power(0);
+    rc = xmm626_sec_modem_hci_power(client, 0);
     if (rc < 0) {
         ipc_client_log(client, "Turning the modem off failed");
         goto error;
@@ -84,7 +84,7 @@ int n5100_boot(struct ipc_client *client)
     ipc_client_log(client, "Turned the modem off");
 
     rc = xmm626_sec_modem_power(client, modem_boot_fd, 1);
-    rc |= xmm626_sec_modem_hci_power(1);
+    rc |= xmm626_sec_modem_hci_power(client, 1);
 
     if (rc < 0) {
         ipc_client_log(client, "Turning the modem on failed");
@@ -175,7 +175,7 @@ int n5100_boot(struct ipc_client *client)
     }
 
     rc = xmm626_sec_modem_link_control_enable(modem_link_fd, 0);
-    rc |= xmm626_sec_modem_hci_power(0);
+    rc |= xmm626_sec_modem_hci_power(client, 0);
     rc |= xmm626_sec_modem_link_control_active(modem_link_fd, 0);
 
     if (rc < 0) {
@@ -191,7 +191,7 @@ int n5100_boot(struct ipc_client *client)
     ipc_client_log(client, "Waited for host wake");
 
     rc = xmm626_sec_modem_link_control_enable(modem_link_fd, 1);
-    rc |= xmm626_sec_modem_hci_power(1);
+    rc |= xmm626_sec_modem_hci_power(client, 1);
     rc |= xmm626_sec_modem_link_control_active(modem_link_fd, 1);
 
     if (rc < 0) {
diff --git a/samsung-ipc/devices/n7100/n7100.c b/samsung-ipc/devices/n7100/n7100.c
index 7fec716..44e46a3 100644
--- a/samsung-ipc/devices/n7100/n7100.c
+++ b/samsung-ipc/devices/n7100/n7100.c
@@ -75,7 +75,7 @@ int n7100_boot(struct ipc_client *client)
     }
     ipc_client_log(client, "Opened modem link device");
 
-    rc = xmm626_sec_modem_hci_power(0);
+    rc = xmm626_sec_modem_hci_power(client, 0);
     if (rc < 0) {
         ipc_client_log(client, "Turning the modem off failed");
         goto error;
@@ -83,7 +83,7 @@ int n7100_boot(struct ipc_client *client)
     ipc_client_log(client, "Turned the modem off");
 
     rc = xmm626_sec_modem_power(client, modem_boot_fd, 1);
-    rc |= xmm626_sec_modem_hci_power(1);
+    rc |= xmm626_sec_modem_hci_power(client, 1);
 
     if (rc < 0) {
         ipc_client_log(client, "Turning the modem on failed");
@@ -174,7 +174,7 @@ int n7100_boot(struct ipc_client *client)
     }
 
     rc = xmm626_sec_modem_link_control_enable(modem_link_fd, 0);
-    rc |= xmm626_sec_modem_hci_power(0);
+    rc |= xmm626_sec_modem_hci_power(client, 0);
     rc |= xmm626_sec_modem_link_control_active(modem_link_fd, 0);
 
     if (rc < 0) {
@@ -190,7 +190,7 @@ int n7100_boot(struct ipc_client *client)
     ipc_client_log(client, "Waited for host wake");
 
     rc = xmm626_sec_modem_link_control_enable(modem_link_fd, 1);
-    rc |= xmm626_sec_modem_hci_power(1);
+    rc |= xmm626_sec_modem_hci_power(client, 1);
     rc |= xmm626_sec_modem_link_control_active(modem_link_fd, 1);
 
     if (rc < 0) {
diff --git a/samsung-ipc/modems/xmm626/xmm626_sec_modem.c b/samsung-ipc/modems/xmm626/xmm626_sec_modem.c
index a6b26f4..ec048cd 100644
--- a/samsung-ipc/modems/xmm626/xmm626_sec_modem.c
+++ b/samsung-ipc/modems/xmm626/xmm626_sec_modem.c
@@ -86,7 +86,7 @@ int xmm626_sec_modem_status_online_wait(int device_fd)
     return -1;
 }
 
-int xmm626_sec_modem_hci_power(int power)
+int xmm626_sec_modem_hci_power(struct ipc_client *client, int power)
 {
     int ehci_rc, ohci_rc;
 
diff --git a/samsung-ipc/modems/xmm626/xmm626_sec_modem.h b/samsung-ipc/modems/xmm626/xmm626_sec_modem.h
index 8e450c6..68ad0df 100644
--- a/samsung-ipc/modems/xmm626/xmm626_sec_modem.h
+++ b/samsung-ipc/modems/xmm626/xmm626_sec_modem.h
@@ -34,7 +34,7 @@
 int xmm626_sec_modem_power(struct ipc_client *client, int device_fd, int power);
 int xmm626_sec_modem_boot_power(int device_fd, int power);
 int xmm626_sec_modem_status_online_wait(int device_fd);
-int xmm626_sec_modem_hci_power(int power);
+int xmm626_sec_modem_hci_power(struct ipc_client *client, int power);
 int xmm626_sec_modem_link_control_enable(int device_fd, int enable);
 int xmm626_sec_modem_link_control_active(int device_fd, int active);
 int xmm626_sec_modem_link_connected_wait(int device_fd);