Merge tag 'nfs-for-4.11-2' of git://git.linux-nfs.org/projects/anna/linux-nfs

[linux-2.6-block.git] / drivers / atm / lanai.c

diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
index 445505d9ea07187902ed95c6ae121591b23cef5c..1a9bc51284b0d547bd85bb1eb6eeebf5dac1492b 100644 (file)
--- a/drivers/atm/lanai.c
+++ b/drivers/atm/lanai.c
@@ -1389,7 +1389,7 @@ static void vcc_rx_aal5(struct lanai_vcc *lvcc, int endptr)
        if (n < 0)
                n += lanai_buf_size(&lvcc->rx.buf);
        APRINTK(n >= 0 && n < lanai_buf_size(&lvcc->rx.buf) && !(n & 15),
-           "vcc_rx_aal5: n out of range (%d/%Zu)\n",
+           "vcc_rx_aal5: n out of range (%d/%zu)\n",
            n, lanai_buf_size(&lvcc->rx.buf));
        /* Recover the second-to-last word to get true pdu length */
        if ((x = &end[-2]) < lvcc->rx.buf.start)
@@ -1493,9 +1493,9 @@ static int lanai_get_sized_buffer(struct lanai_dev *lanai,
                return -ENOMEM;
        if (unlikely(lanai_buf_size(buf) < size))
                printk(KERN_WARNING DEV_LABEL "(itf %d): wanted %d bytes "
-                   "for %s buffer, got only %Zu\n", lanai->number, size,
+                   "for %s buffer, got only %zu\n", lanai->number, size,
                    name, lanai_buf_size(buf));
-       DPRINTK("Allocated %Zu byte %s buffer\n", lanai_buf_size(buf), name);
+       DPRINTK("Allocated %zu byte %s buffer\n", lanai_buf_size(buf), name);
        return 0;
 }
 
@@ -1586,7 +1586,7 @@ static int service_buffer_allocate(struct lanai_dev *lanai)
            lanai->pci);
        if (unlikely(lanai->service.start == NULL))
                return -ENOMEM;
-       DPRINTK("allocated service buffer at 0x%08lX, size %Zu(%d)\n",
+       DPRINTK("allocated service buffer at 0x%08lX, size %zu(%d)\n",
            (unsigned long) lanai->service.start,
            lanai_buf_size(&lanai->service),
            lanai_buf_size_cardorder(&lanai->service));
@@ -2467,8 +2467,8 @@ static int lanai_proc_read(struct atm_dev *atmdev, loff_t *pos, char *page)
                    (lanai->status & STATUS_LED) ? 1 : 0,
                    (lanai->status & STATUS_GPIN) ? 1 : 0);
        if (left-- == 0)
-               return sprintf(page, "global buffer sizes: service=%Zu, "
-                   "aal0_rx=%Zu\n", lanai_buf_size(&lanai->service),
+               return sprintf(page, "global buffer sizes: service=%zu, "
+                   "aal0_rx=%zu\n", lanai_buf_size(&lanai->service),
                    lanai->naal0 ? lanai_buf_size(&lanai->aal0buf) : 0);
        if (left-- == 0) {
                get_statistics(lanai);
@@ -2513,7 +2513,7 @@ static int lanai_proc_read(struct atm_dev *atmdev, loff_t *pos, char *page)
                left += sprintf(&page[left], ",\n          rx_AAL=%d",
                    lvcc->rx.atmvcc->qos.aal == ATM_AAL5 ? 5 : 0);
                if (lvcc->rx.atmvcc->qos.aal == ATM_AAL5)
-                       left += sprintf(&page[left], ", rx_buf_size=%Zu, "
+                       left += sprintf(&page[left], ", rx_buf_size=%zu, "
                            "rx_bad_len=%u,\n          rx_service_trash=%u, "
                            "rx_service_stream=%u, rx_bad_crc=%u",
                            lanai_buf_size(&lvcc->rx.buf),
@@ -2524,7 +2524,7 @@ static int lanai_proc_read(struct atm_dev *atmdev, loff_t *pos, char *page)
        }
        if (lvcc->tx.atmvcc != NULL)
                left += sprintf(&page[left], ",\n          tx_AAL=%d, "
-                   "tx_buf_size=%Zu, tx_qos=%cBR, tx_backlogged=%c",
+                   "tx_buf_size=%zu, tx_qos=%cBR, tx_backlogged=%c",
                    lvcc->tx.atmvcc->qos.aal == ATM_AAL5 ? 5 : 0,
                    lanai_buf_size(&lvcc->tx.buf),
                    lvcc->tx.atmvcc == lanai->cbrvcc ? 'C' : 'U',