[TELEPHONY]: Fix 64-bit warnings in ixj.c

1) Use unsigned long for types holding jiffies.
2) Use size_t for read/write buffer lengths.
3) Use proper printf format string for size_t.

diff --git a/drivers/telephony/ixj.c b/drivers/telephony/ixj.c
index fe9c12cc0b38c76f6dc4644f971c56ab0e8facec..74d68c51b957e53be002a30d1b4407ec57f4b008 100644 (file)
--- a/drivers/telephony/ixj.c
+++ b/drivers/telephony/ixj.c
@@ -7247,8 +7247,8 @@ static int ixj_get_status_proc(char *buf)
        len += sprintf(buf + len, "\n%s", ixj_h_rcsid);
        len += sprintf(buf + len, "\n%s", ixjuser_h_rcsid);
        len += sprintf(buf + len, "\nDriver version %i.%i.%i", IXJ_VER_MAJOR, IXJ_VER_MINOR, IXJ_BLD_VER);
-       len += sprintf(buf + len, "\nsizeof IXJ struct %d bytes", sizeof(IXJ));
-       len += sprintf(buf + len, "\nsizeof DAA struct %d bytes", sizeof(DAA_REGS));
+       len += sprintf(buf + len, "\nsizeof IXJ struct %Zd bytes", sizeof(IXJ));
+       len += sprintf(buf + len, "\nsizeof DAA struct %Zd bytes", sizeof(DAA_REGS));
        len += sprintf(buf + len, "\nUsing old telephony API");
        len += sprintf(buf + len, "\nDebug Level %d\n", ixjdebug);
 

diff --git a/drivers/telephony/ixj.h b/drivers/telephony/ixj.h
index 44ebbce3443c2f8aa33738ed6ab35aa093aa4e6f..6d46a4e848d9105591578f7b559b0b7837f2c263 100644 (file)
--- a/drivers/telephony/ixj.h
+++ b/drivers/telephony/ixj.h
@@ -1213,7 +1213,7 @@ typedef struct {
 #endif
        char *read_buffer, *read_buffer_end;
        char *read_convert_buffer;
-       unsigned int read_buffer_size;
+       size_t read_buffer_size;
        unsigned int read_buffer_ready;
 #if LINUX_VERSION_CODE < 0x020400
        struct wait_queue *write_q;
@@ -1222,7 +1222,7 @@ typedef struct {
 #endif
        char *write_buffer, *write_buffer_end;
        char *write_convert_buffer;
-       unsigned int write_buffer_size;
+       size_t write_buffer_size;
        unsigned int write_buffers_empty;
        unsigned long drybuffer;
        char *write_buffer_rp, *write_buffer_wp;
@@ -1281,7 +1281,7 @@ typedef struct {
        unsigned char fskcnt;
         unsigned int cidsize;
        unsigned int cidcnt;
-       unsigned pstn_cid_received;
+       unsigned long pstn_cid_received;
        PHONE_CID cid;
        PHONE_CID cid_send;
        unsigned long pstn_ring_int;