scsi: esas2r: Fix format string type mistakes

This adds the missing __printf attribute which allows compile time
format string checking (and will be used by the coming initify gcc
plugin). Additionally, this fixes the warnings exposed by the attribute.

Signed-off-by: Emese Revfy <re.emese@gmail.com>
[kees: split scsi/acpi, merged attr and fix, new commit messages]
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/esas2r/esas2r_init.c b/drivers/scsi/esas2r/esas2r_init.c
index d6e53ae..6432a50 100644 (file)
--- a/drivers/scsi/esas2r/esas2r_init.c
+++ b/drivers/scsi/esas2r/esas2r_init.c
@@ -237,7 +237,7 @@ static void esas2r_claim_interrupts(struct esas2r_adapter *a)
                flags |= IRQF_SHARED;
 
        esas2r_log(ESAS2R_LOG_INFO,
-                  "esas2r_claim_interrupts irq=%d (%p, %s, %x)",
+                  "esas2r_claim_interrupts irq=%d (%p, %s, %lx)",
                   a->pcid->irq, a, a->name, flags);
 
        if (request_irq(a->pcid->irq,

diff --git a/drivers/scsi/esas2r/esas2r_ioctl.c b/drivers/scsi/esas2r/esas2r_ioctl.c
index 3e84834..b35ed38 100644 (file)
--- a/drivers/scsi/esas2r/esas2r_ioctl.c
+++ b/drivers/scsi/esas2r/esas2r_ioctl.c
@@ -1301,7 +1301,7 @@ int esas2r_ioctl_handler(void *hostdata, int cmd, void __user *arg)
        ioctl = kzalloc(sizeof(struct atto_express_ioctl), GFP_KERNEL);
        if (ioctl == NULL) {
                esas2r_log(ESAS2R_LOG_WARN,
-                          "ioctl_handler kzalloc failed for %d bytes",
+                          "ioctl_handler kzalloc failed for %zu bytes",
                           sizeof(struct atto_express_ioctl));
                return -ENOMEM;
        }

diff --git a/drivers/scsi/esas2r/esas2r_log.h b/drivers/scsi/esas2r/esas2r_log.h
index 7b6397b..75b9d23 100644 (file)
--- a/drivers/scsi/esas2r/esas2r_log.h
+++ b/drivers/scsi/esas2r/esas2r_log.h
@@ -61,8 +61,8 @@ enum {
 #endif
 };
 
-int esas2r_log(const long level, const char *format, ...);
-int esas2r_log_dev(const long level,
+__printf(2, 3) int esas2r_log(const long level, const char *format, ...);
+__printf(3, 4) int esas2r_log_dev(const long level,
                   const struct device *dev,
                   const char *format,
                   ...);

diff --git a/drivers/scsi/esas2r/esas2r_main.c b/drivers/scsi/esas2r/esas2r_main.c
index 5092c82..f2e9d8a 100644 (file)
--- a/drivers/scsi/esas2r/esas2r_main.c
+++ b/drivers/scsi/esas2r/esas2r_main.c
@@ -198,7 +198,7 @@ static ssize_t write_hw(struct file *file, struct kobject *kobj,
                                              GFP_KERNEL);
                if (a->local_atto_ioctl == NULL) {
                        esas2r_log(ESAS2R_LOG_WARN,
-                                  "write_hw kzalloc failed for %d bytes",
+                                  "write_hw kzalloc failed for %zu bytes",
                                   sizeof(struct atto_ioctl));
                        return -ENOMEM;
                }
@@ -1186,7 +1186,7 @@ retry:
                } else {
                        esas2r_log(ESAS2R_LOG_CRIT,
                                   "unable to allocate a request for a "
-                                  "device reset (%d:%d)!",
+                                  "device reset (%d:%llu)!",
                                   cmd->device->id,
                                   cmd->device->lun);
                }