device: generic: get rid of printf

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

2 files changed, 16 insertions, 14 deletions

diff --git a/samsung-ipc/devices/generic/generic.c b/samsung-ipc/devices/generic/generic.c
index e30af95..1c78780 100644
--- a/samsung-ipc/devices/generic/generic.c
+++ b/samsung-ipc/devices/generic/generic.c
@@ -50,7 +50,7 @@ int xmm626_kernel_linux_modem_power(__attribute__((unused)) int device_fd,
 	return 0;
 }
 
-int xmm626_kernel_linux_modem_hci_power(int power)
+int xmm626_kernel_linux_modem_hci_power(struct ipc_client *client, int power)
 {
 	int ehci_rc, ohci_rc = -1;
 
@@ -82,7 +82,7 @@ int xmm626_kernel_linux_modem_hci_power(int power)
 	}
 
 	if (ohci_rc < 0) {
-		printf("ohci_rc < 0\n");
+		ipc_client_log(client, "%s: ohci_rc < 0\n", __func__);
 	}
 	if (ehci_rc < 0 && ohci_rc < 0)
 		return -1;
@@ -144,7 +144,7 @@ int xmm626_kernel_linux_modem_open(struct ipc_client *client, int type)
 	int i = 0;
 	int err = 0;
 
-	printf("ENTER %s\n", __func__);
+	ipc_client_log(client, "ENTER %s\n", __func__);
 	while (fd < 0 && i < 30) {
 		i++;
 		usleep(30000);
@@ -156,7 +156,7 @@ int xmm626_kernel_linux_modem_open(struct ipc_client *client, int type)
 				  O_RDWR | O_NOCTTY | O_NONBLOCK);
 			if (fd < 0) {
 				err = errno;
-				printf("%s: open(%s, "
+				ipc_client_log(client, "%s: open(%s, "
 				       "O_RDWR | O_NOCTTY | O_NONBLOCK) => "
 				       "%d errno: %d\n",
 				       __func__,
@@ -171,7 +171,7 @@ int xmm626_kernel_linux_modem_open(struct ipc_client *client, int type)
 				  O_RDWR | O_NOCTTY | O_NONBLOCK);
 			if (fd < 0) {
 				err  = errno;
-				printf("%s: open(%s, "
+				ipc_client_log(client, "%s: open(%s, "
 				       "O_RDWR | O_NOCTTY | O_NONBLOCK) => "
 				       "%d errno: %d\n",
 				       __func__,
@@ -180,7 +180,7 @@ int xmm626_kernel_linux_modem_open(struct ipc_client *client, int type)
 			}
 			break;
 		default:
-			printf("%s: unknown type\n", __func__);
+			ipc_client_log(client, "%s: unknown type\n", __func__);
 			return -1;
 		}
 	}
@@ -282,7 +282,7 @@ int generic_boot(struct ipc_client *client)
 			       rc);
 		goto error;
 	}
-	rc = xmm626_kernel_linux_modem_hci_power(0);
+	rc = xmm626_kernel_linux_modem_hci_power(client, 0);
 	if (rc < 0) {
 		ipc_client_log(client,
 			       "xmm626_kernel_linux_modem_hci_power: "
@@ -293,7 +293,8 @@ int generic_boot(struct ipc_client *client)
 	system("lsusb");
 
 	rc = xmm626_kernel_linux_modem_power(unused, 1);
-	printf("%s: xmm626_kernel_linux_modem_power(NULL, 1) = %d\n",
+	ipc_client_log(client,
+		       "%s: xmm626_kernel_linux_modem_power(NULL, 1) = %d\n",
 	       __func__, rc);
 	if (rc < 0) {
 		ipc_client_log(client,
@@ -302,9 +303,10 @@ int generic_boot(struct ipc_client *client)
 			       rc);
 	}
 
-	rc = xmm626_kernel_linux_modem_hci_power(1);
-	printf("%s: xmm626_kernel_linux_modem_hci_power(1) = %d\n",
-	       __func__, rc);
+	rc = xmm626_kernel_linux_modem_hci_power(client, 1);
+	ipc_client_log(client,
+		       "%s: xmm626_kernel_linux_modem_hci_power(client, 1) = %d\n",
+		       __func__, rc);
 	if (rc < 0) {
 		ipc_client_log(client,
 			       "xmm626_kernel_linux_modem_hci_power on failed");
@@ -407,7 +409,7 @@ int generic_boot(struct ipc_client *client)
 	}
 	ipc_client_log(client, "Waited for host wake");
 
-	rc = xmm626_kernel_linux_modem_hci_power(0);
+	rc = xmm626_kernel_linux_modem_hci_power(client, 0);
 
 	if (rc < 0) {
 		ipc_client_log(client, "Turning the modem off failed");
@@ -421,7 +423,7 @@ int generic_boot(struct ipc_client *client)
 	}
 	ipc_client_log(client, "Waited for host wake");
 
-	rc = xmm626_kernel_linux_modem_hci_power(1);
+	rc = xmm626_kernel_linux_modem_hci_power(client, 1);
 	if (rc < 0) {
 		ipc_client_log(client, "Turning the modem on failed");
 		goto error;
diff --git a/samsung-ipc/devices/generic/generic.h b/samsung-ipc/devices/generic/generic.h
index 291f329..a2ec08a 100644
--- a/samsung-ipc/devices/generic/generic.h
+++ b/samsung-ipc/devices/generic/generic.h
@@ -57,7 +57,7 @@ extern struct ipc_client_gprs_specs generic_gprs_specs;
 extern struct ipc_client_nv_data_specs generic_nv_data_specs;
 
 int xmm626_kernel_linux_modem_power(__attribute__((unused)) int device_fd, int power);
-int xmm626_kernel_linux_modem_hci_power(int power);
+int xmm626_kernel_linux_modem_hci_power(struct ipc_client *client, int power);
 int xmm626_kernel_linux_modem_link_connected_wait(__attribute__((unused)) int device_fd);
 int xmm626_kernel_linux_modem_open(struct ipc_client *client, int type);
 int xmm626_kernel_linux_modem_read(int fd, void *buffer, size_t length);