[PATCH 0/5] tpm: tpm_ibmvtpm: - style fix
Fix styling WARNINGs and Errors of tpm_ibmvtpm.c driver by using checkpatch.pl SZ Lin (5): Fix packed and aligned attribute warnings. Fix "ERROR: code indent should use tabs where possible" Fix 'void function return statements are not generally useful' warning Remove unneccessary 'out of memory' message Use __func__ instead of function name drivers/char/tpm/tpm_ibmvtpm.c | 23 +-- drivers/char/tpm/tpm_ibmvtpm.h | 2 +- 2 files changed, 10 insertions(+), 15 deletions(-) -- 2.13.3
[PATCH 1/5] Fix packed and aligned attribute warnings.
WARNING: __packed is preferred over __attribute__((packed))
+} __attribute__((packed, aligned(8)));
WARNING: __aligned(size) is preferred over __attribute__((aligned(size)))
+} __attribute__((packed, aligned(8)));
Signed-off-by: SZ Lin
---
drivers/char/tpm/tpm_ibmvtpm.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/char/tpm/tpm_ibmvtpm.h b/drivers/char/tpm/tpm_ibmvtpm.h
index 91dfe766d080..9f708ca3dc84 100644
--- a/drivers/char/tpm/tpm_ibmvtpm.h
+++ b/drivers/char/tpm/tpm_ibmvtpm.h
@@ -25,7 +25,7 @@ struct ibmvtpm_crq {
__be16 len;
__be32 data;
__be64 reserved;
-} __attribute__((packed, aligned(8)));
+} __packed __aligned(8);
struct ibmvtpm_crq_queue {
struct ibmvtpm_crq *crq_addr;
--
2.13.3
[PATCH 3/5] Fix 'void function return statements are not generally useful' warning
WARNING: void function return statements are not generally useful + return; +} Signed-off-by: SZ Lin --- drivers/char/tpm/tpm_ibmvtpm.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/char/tpm/tpm_ibmvtpm.c b/drivers/char/tpm/tpm_ibmvtpm.c index 23913fc86158..e53b9fb517d9 100644 --- a/drivers/char/tpm/tpm_ibmvtpm.c +++ b/drivers/char/tpm/tpm_ibmvtpm.c @@ -531,7 +531,6 @@ static void ibmvtpm_crq_process(struct ibmvtpm_crq *crq, return; } } - return; } /** -- 2.13.3
[PATCH 2/5] Fix "ERROR: code indent should use tabs where possible"
ERROR: code indent should use tabs where possible
+^I^I "Need to wait for TPM to finish\n");$
Signed-off-by: SZ Lin
---
drivers/char/tpm/tpm_ibmvtpm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/char/tpm/tpm_ibmvtpm.c b/drivers/char/tpm/tpm_ibmvtpm.c
index f01d083eced2..23913fc86158 100644
--- a/drivers/char/tpm/tpm_ibmvtpm.c
+++ b/drivers/char/tpm/tpm_ibmvtpm.c
@@ -127,7 +127,7 @@ static int tpm_ibmvtpm_send(struct tpm_chip *chip, u8 *buf,
size_t count)
if (ibmvtpm->tpm_processing_cmd) {
dev_info(ibmvtpm->dev,
-"Need to wait for TPM to finish\n");
+ "Need to wait for TPM to finish\n");
/* wait for previous command to finish */
sig = wait_event_interruptible(ibmvtpm->wq,
!ibmvtpm->tpm_processing_cmd);
if (sig)
--
2.13.3
[PATCH 4/5] Remove unneccessary 'out of memory' message
WARNING: Possible unnecessary 'out of memory' message
+ if (!ibmvtpm->rtce_buf) {
+ dev_err(ibmvtpm->dev, "Failed to allocate
memory for rtce buffer\n");
WARNING: Possible unnecessary 'out of memory' message
+ if (!ibmvtpm) {
+ dev_err(dev, "kzalloc for ibmvtpm failed\n");
Signed-off-by: SZ Lin
---
drivers/char/tpm/tpm_ibmvtpm.c | 8 ++--
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/drivers/char/tpm/tpm_ibmvtpm.c b/drivers/char/tpm/tpm_ibmvtpm.c
index e53b9fb517d9..e75a674b44ac 100644
--- a/drivers/char/tpm/tpm_ibmvtpm.c
+++ b/drivers/char/tpm/tpm_ibmvtpm.c
@@ -501,10 +501,8 @@ static void ibmvtpm_crq_process(struct ibmvtpm_crq *crq,
ibmvtpm->rtce_size = be16_to_cpu(crq->len);
ibmvtpm->rtce_buf = kmalloc(ibmvtpm->rtce_size,
GFP_ATOMIC);
- if (!ibmvtpm->rtce_buf) {
- dev_err(ibmvtpm->dev, "Failed to allocate
memory for rtce buffer\n");
+ if (!ibmvtpm->rtce_buf)
return;
- }
ibmvtpm->rtce_dma_handle = dma_map_single(ibmvtpm->dev,
ibmvtpm->rtce_buf, ibmvtpm->rtce_size,
@@ -584,10 +582,8 @@ static int tpm_ibmvtpm_probe(struct vio_dev *vio_dev,
return PTR_ERR(chip);
ibmvtpm = kzalloc(sizeof(struct ibmvtpm_dev), GFP_KERNEL);
- if (!ibmvtpm) {
- dev_err(dev, "kzalloc for ibmvtpm failed\n");
+ if (!ibmvtpm)
goto cleanup;
- }
ibmvtpm->dev = dev;
ibmvtpm->vdev = vio_dev;
--
2.13.3
[PATCH 5/5] Use __func__ instead of function name
Fix following checkpatch.pl warning:
WARNING: Prefer using '"%s...", __func__' to using
the function's name, in a string
Signed-off-by: SZ Lin
---
drivers/char/tpm/tpm_ibmvtpm.c | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/char/tpm/tpm_ibmvtpm.c b/drivers/char/tpm/tpm_ibmvtpm.c
index e75a674b44ac..2d33acc43e25 100644
--- a/drivers/char/tpm/tpm_ibmvtpm.c
+++ b/drivers/char/tpm/tpm_ibmvtpm.c
@@ -151,7 +151,7 @@ static int tpm_ibmvtpm_send(struct tpm_chip *chip, u8 *buf,
size_t count)
rc = ibmvtpm_send_crq(ibmvtpm->vdev, be64_to_cpu(word[0]),
be64_to_cpu(word[1]));
if (rc != H_SUCCESS) {
- dev_err(ibmvtpm->dev, "tpm_ibmvtpm_send failed rc=%d\n", rc);
+ dev_err(ibmvtpm->dev, "%s failed rc=%d\n", __func__, rc);
rc = 0;
ibmvtpm->tpm_processing_cmd = false;
} else
@@ -193,7 +193,7 @@ static int ibmvtpm_crq_get_rtce_size(struct ibmvtpm_dev
*ibmvtpm)
cpu_to_be64(buf[1]));
if (rc != H_SUCCESS)
dev_err(ibmvtpm->dev,
- "ibmvtpm_crq_get_rtce_size failed rc=%d\n", rc);
+ "%s failed rc=%d\n", __func__, rc);
return rc;
}
@@ -221,7 +221,7 @@ static int ibmvtpm_crq_get_version(struct ibmvtpm_dev
*ibmvtpm)
cpu_to_be64(buf[1]));
if (rc != H_SUCCESS)
dev_err(ibmvtpm->dev,
- "ibmvtpm_crq_get_version failed rc=%d\n", rc);
+ "%s failed rc=%d\n", __func__, rc);
return rc;
}
@@ -241,7 +241,7 @@ static int ibmvtpm_crq_send_init_complete(struct
ibmvtpm_dev *ibmvtpm)
rc = ibmvtpm_send_crq(ibmvtpm->vdev, INIT_CRQ_COMP_CMD, 0);
if (rc != H_SUCCESS)
dev_err(ibmvtpm->dev,
- "ibmvtpm_crq_send_init_complete failed rc=%d\n", rc);
+ "%s rc=%d\n", __func__, rc);
return rc;
}
@@ -261,7 +261,7 @@ static int ibmvtpm_crq_send_init(struct ibmvtpm_dev
*ibmvtpm)
rc = ibmvtpm_send_crq(ibmvtpm->vdev, INIT_CRQ_CMD, 0);
if (rc != H_SUCCESS)
dev_err(ibmvtpm->dev,
- "ibmvtpm_crq_send_init failed rc=%d\n", rc);
+ "%s failed rc=%d\n", __func__, rc);
return rc;
}
@@ -351,7 +351,7 @@ static int tpm_ibmvtpm_suspend(struct device *dev)
cpu_to_be64(buf[1]));
if (rc != H_SUCCESS)
dev_err(ibmvtpm->dev,
- "tpm_ibmvtpm_suspend failed rc=%d\n", rc);
+ "%s failed rc=%d\n", __func__, rc);
return rc;
}
--
2.13.3
