int rc;
 
        netdev_dbg(adapter->netdev, "Sending CRQ: %016lx %016lx\n",
-                  (unsigned long int)cpu_to_be64(u64_crq[0]),
-                  (unsigned long int)cpu_to_be64(u64_crq[1]));
+                  (unsigned long)cpu_to_be64(u64_crq[0]),
+                  (unsigned long)cpu_to_be64(u64_crq[1]));
 
        if (!adapter->crq.active &&
            crq->generic.first != IBMVNIC_CRQ_INIT_CMD) {
        netdev_dbg(adapter->netdev, "Login Buffer:\n");
        for (i = 0; i < (adapter->login_buf_sz - 1) / 8 + 1; i++) {
                netdev_dbg(adapter->netdev, "%016lx\n",
-                          ((unsigned long int *)(adapter->login_buf))[i]);
+                          ((unsigned long *)(adapter->login_buf))[i]);
        }
 
        memset(&crq, 0, sizeof(crq));
        netdev_dbg(adapter->netdev, "Query IP Offload Buffer:\n");
        for (i = 0; i < (sizeof(adapter->ip_offload_buf) - 1) / 8 + 1; i++)
                netdev_dbg(adapter->netdev, "%016lx\n",
-                          ((unsigned long int *)(buf))[i]);
+                          ((unsigned long *)(buf))[i]);
 
        netdev_dbg(adapter->netdev, "ipv4_chksum = %d\n", buf->ipv4_chksum);
        netdev_dbg(adapter->netdev, "ipv6_chksum = %d\n", buf->ipv6_chksum);
        case PARTIALSUCCESS:
                dev_info(dev, "req=%lld, rsp=%ld in %s queue, retrying.\n",
                         *req_value,
-                        (long int)be64_to_cpu(crq->request_capability_rsp.
+                        (long)be64_to_cpu(crq->request_capability_rsp.
                                               number), name);
 
                if (be16_to_cpu(crq->request_capability_rsp.capability) ==
        netdev_dbg(adapter->netdev, "Login Response Buffer:\n");
        for (i = 0; i < (adapter->login_rsp_buf_sz - 1) / 8 + 1; i++) {
                netdev_dbg(adapter->netdev, "%016lx\n",
-                          ((unsigned long int *)(adapter->login_rsp_buf))[i]);
+                          ((unsigned long *)(adapter->login_rsp_buf))[i]);
        }
 
        /* Sanity checks */
        long rc;
 
        netdev_dbg(netdev, "Handling CRQ: %016lx %016lx\n",
-                  (unsigned long int)cpu_to_be64(u64_crq[0]),
-                  (unsigned long int)cpu_to_be64(u64_crq[1]));
+                  (unsigned long)cpu_to_be64(u64_crq[0]),
+                  (unsigned long)cpu_to_be64(u64_crq[1]));
        switch (gen_crq->first) {
        case IBMVNIC_CRQ_INIT_RSP:
                switch (gen_crq->cmd) {