[PATCH] tpm: compiler cleanup

Kylene Jo Hall
2006-04-11T22:31:45Z

Fix compiler warnings about strict type checking with the max macro.

Signed-off-by: Kylie Hall <kjhall@us.ibm.com>
---
drivers/char/tpm/tpm.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)

--- linux-2.6.17-rc1-mm2/drivers/char/tpm/tpm.c 2006-04-11 17:30:57.612009250 -0500
+++ linux-2.6.17-rc1/drivers/char/tpm/tpm.c 2006-04-11 17:19:30.969096750 -0500
@@ -490,7 +490,7 @@ static ssize_t transmit_cmd(struct tpm_c

void tpm_gen_interrupt(struct tpm_chip *chip)
{
- u8 data[max(ARRAY_SIZE(tpm_cap), 30)];
+ u8 data[max_t(int, ARRAY_SIZE(tpm_cap), 30)];
ssize_t rc;

memcpy(data, tpm_cap, sizeof(tpm_cap));
@@ -504,7 +504,7 @@ EXPORT_SYMBOL_GPL(tpm_gen_interrupt);

void tpm_get_timeouts(struct tpm_chip *chip)
{
- u8 data[max(ARRAY_SIZE(TPM_CAP), 30)];
+ u8 data[max_t(int, ARRAY_SIZE(tpm_cap), 30)];
ssize_t rc;
u32 timeout;

@@ -577,7 +577,7 @@ EXPORT_SYMBOL_GPL(tpm_continue_selftest)
ssize_t tpm_show_enabled(struct device * dev, struct device_attribute * attr,
char *buf)
{
- u8 data[max(ARRAY_SIZE(tpm_cap), 30)];
+ u8 data[max_t(int, ARRAY_SIZE(tpm_cap), 30)];
ssize_t rc;

struct tpm_chip *chip = dev_get_drvdata(dev);
@@ -599,7 +599,7 @@ EXPORT_SYMBOL_GPL(tpm_show_enabled);
ssize_t tpm_show_active(struct device * dev, struct device_attribute * attr,
char *buf)
{
- u8 data[max(ARRAY_SIZE(tpm_cap), 35)];
+ u8 data[max_t(int, ARRAY_SIZE(tpm_cap), 35)];
ssize_t rc;

struct tpm_chip *chip = dev_get_drvdata(dev);
@@ -672,7 +672,7 @@ static const u8 pcrread[] = {
ssize_t tpm_show_pcrs(struct device *dev, struct device_attribute *attr,
char *buf)
{
- u8 data[max(max(ARRAY_SIZE(tpm_cap), ARRAY_SIZE(pcrread)), 30)];
+ u8 data[max_t(int, max(ARRAY_SIZE(tpm_cap), ARRAY_SIZE(pcrread)), 30)];
ssize_t rc;
int i, j, num_pcrs;
__be32 index;
@@ -789,7 +789,7 @@ static const u8 cap_version[] = {
ssize_t tpm_show_caps(struct device *dev, struct device_attribute *attr,
char *buf)
{
- u8 data[max(max(ARRAY_SIZE(tpm_cap), ARRAY_SIZE(cap_version)), 30)];
+ u8 data[max_t(int, max(ARRAY_SIZE(tpm_cap), ARRAY_SIZE(cap_version)), 30)];
ssize_t rc;
char *str = buf;

@@ -829,7 +829,7 @@ EXPORT_SYMBOL_GPL(tpm_show_caps);
ssize_t tpm_show_caps_1_2(struct device * dev,
struct device_attribute * attr, char *buf)
{
- u8 data[max(max(ARRAY_SIZE(tpm_cap), ARRAY_SIZE(cap_version)), 30)];
+ u8 data[max_t(int, max(ARRAY_SIZE(tpm_cap), ARRAY_SIZE(cap_version)), 30)];
ssize_t len;
char *str = buf;