Patchwork tpm_tis: unconstify array cmd_getticks

login
register
mail settings
Submitter Colin King
Date Sept. 7, 2017, 8:42 a.m.
Message ID <20170907084245.19513-1-colin.king@canonical.com>
Download mbox | patch
Permalink /patch/333489/
State New
Headers show

Comments

Colin King - Sept. 7, 2017, 8:42 a.m.
From: Colin Ian King <colin.king@canonical.com>

Remove const from cmd_getticks, fixes build warnings:

drivers/char/tpm/tpm_tis_core.c:469:31: warning: passing argument 2 of
'tpm_tis_send_data' discards 'const' qualifier from pointer target
type [-Wdiscarded-qualifiers]
  rc = tpm_tis_send_data(chip, cmd_getticks, len);
                               ^
drivers/char/tpm/tpm_tis_core.c:477:31: warning: passing argument 2 of
'tpm_tis_send_data' discards 'const' qualifier from pointer target
type [-Wdiscarded-qualifiers]
  rc = tpm_tis_send_data(chip, cmd_getticks, len);
                               ^
Fixes: 5e35bd8e06b9 ("tpm_tis: make array cmd_getticks static const to shink object code size")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 drivers/char/tpm/tpm_tis_core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Colin King - Sept. 7, 2017, 2:02 p.m.
On 07/09/17 09:42, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
> 
> Remove const from cmd_getticks, fixes build warnings:
> 
> drivers/char/tpm/tpm_tis_core.c:469:31: warning: passing argument 2 of
> 'tpm_tis_send_data' discards 'const' qualifier from pointer target
> type [-Wdiscarded-qualifiers]
>   rc = tpm_tis_send_data(chip, cmd_getticks, len);
>                                ^
> drivers/char/tpm/tpm_tis_core.c:477:31: warning: passing argument 2 of
> 'tpm_tis_send_data' discards 'const' qualifier from pointer target
> type [-Wdiscarded-qualifiers]
>   rc = tpm_tis_send_data(chip, cmd_getticks, len);
>                                ^
> Fixes: 5e35bd8e06b9 ("tpm_tis: make array cmd_getticks static const to shink object code size")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>  drivers/char/tpm/tpm_tis_core.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c
> index 1e957e923d21..91cf38be314f 100644
> --- a/drivers/char/tpm/tpm_tis_core.c
> +++ b/drivers/char/tpm/tpm_tis_core.c
> @@ -445,7 +445,7 @@ static int probe_itpm(struct tpm_chip *chip)
>  {
>  	struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev);
>  	int rc = 0;
> -	static const u8 cmd_getticks[] = {
> +	static u8 cmd_getticks[] = {
>  		0x00, 0xc1, 0x00, 0x00, 0x00, 0x0a,
>  		0x00, 0x00, 0x00, 0xf1
>  	};
> 
Ignore this, seems like Arnd Bergmann has fixed this properly.

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
Jarkko Sakkinen - Sept. 7, 2017, 4:21 p.m.
On Thu, Sep 07, 2017 at 03:02:32PM +0100, Colin Ian King wrote:
> On 07/09/17 09:42, Colin King wrote:
> > From: Colin Ian King <colin.king@canonical.com>
> > 
> > Remove const from cmd_getticks, fixes build warnings:
> > 
> > drivers/char/tpm/tpm_tis_core.c:469:31: warning: passing argument 2 of
> > 'tpm_tis_send_data' discards 'const' qualifier from pointer target
> > type [-Wdiscarded-qualifiers]
> >   rc = tpm_tis_send_data(chip, cmd_getticks, len);
> >                                ^
> > drivers/char/tpm/tpm_tis_core.c:477:31: warning: passing argument 2 of
> > 'tpm_tis_send_data' discards 'const' qualifier from pointer target
> > type [-Wdiscarded-qualifiers]
> >   rc = tpm_tis_send_data(chip, cmd_getticks, len);
> >                                ^
> > Fixes: 5e35bd8e06b9 ("tpm_tis: make array cmd_getticks static const to shink object code size")
> > Signed-off-by: Colin Ian King <colin.king@canonical.com>
> > ---
> >  drivers/char/tpm/tpm_tis_core.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c
> > index 1e957e923d21..91cf38be314f 100644
> > --- a/drivers/char/tpm/tpm_tis_core.c
> > +++ b/drivers/char/tpm/tpm_tis_core.c
> > @@ -445,7 +445,7 @@ static int probe_itpm(struct tpm_chip *chip)
> >  {
> >  	struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev);
> >  	int rc = 0;
> > -	static const u8 cmd_getticks[] = {
> > +	static u8 cmd_getticks[] = {
> >  		0x00, 0xc1, 0x00, 0x00, 0x00, 0x0a,
> >  		0x00, 0x00, 0x00, 0xf1
> >  	};
> > 
> Ignore this, seems like Arnd Bergmann has fixed this properly.

Got you! Thanks.

/Jarkko

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot

Patch

diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c
index 1e957e923d21..91cf38be314f 100644
--- a/drivers/char/tpm/tpm_tis_core.c
+++ b/drivers/char/tpm/tpm_tis_core.c
@@ -445,7 +445,7 @@  static int probe_itpm(struct tpm_chip *chip)
 {
 	struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev);
 	int rc = 0;
-	static const u8 cmd_getticks[] = {
+	static u8 cmd_getticks[] = {
 		0x00, 0xc1, 0x00, 0x00, 0x00, 0x0a,
 		0x00, 0x00, 0x00, 0xf1
 	};