| From foo@baz Sat Jul 28 12:29:48 CEST 2018 |
| From: Mauro Carvalho Chehab <mchehab@s-opensource.com> |
| Date: Fri, 6 Apr 2018 07:54:51 -0400 |
| Subject: media: si470x: fix __be16 annotations |
| |
| From: Mauro Carvalho Chehab <mchehab@s-opensource.com> |
| |
| [ Upstream commit 90db5c829692a0a7845e977e45719b4699216bd4 ] |
| |
| The annotations there are wrong as warned: |
| drivers/media/radio/si470x/radio-si470x-i2c.c:107:35: warning: cast to restricted __be16 |
| drivers/media/radio/si470x/radio-si470x-i2c.c:107:35: warning: cast to restricted __be16 |
| drivers/media/radio/si470x/radio-si470x-i2c.c:107:35: warning: cast to restricted __be16 |
| drivers/media/radio/si470x/radio-si470x-i2c.c:107:35: warning: cast to restricted __be16 |
| drivers/media/radio/si470x/radio-si470x-i2c.c:129:24: warning: incorrect type in assignment (different base types) |
| drivers/media/radio/si470x/radio-si470x-i2c.c:129:24: expected unsigned short [unsigned] [short] <noident> |
| drivers/media/radio/si470x/radio-si470x-i2c.c:129:24: got restricted __be16 [usertype] <noident> |
| drivers/media/radio/si470x/radio-si470x-i2c.c:163:39: warning: cast to restricted __be16 |
| drivers/media/radio/si470x/radio-si470x-i2c.c:163:39: warning: cast to restricted __be16 |
| drivers/media/radio/si470x/radio-si470x-i2c.c:163:39: warning: cast to restricted __be16 |
| drivers/media/radio/si470x/radio-si470x-i2c.c:163:39: warning: cast to restricted __be16 |
| |
| Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/media/radio/si470x/radio-si470x-i2c.c | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| --- a/drivers/media/radio/si470x/radio-si470x-i2c.c |
| +++ b/drivers/media/radio/si470x/radio-si470x-i2c.c |
| @@ -96,7 +96,7 @@ MODULE_PARM_DESC(max_rds_errors, "RDS ma |
| */ |
| int si470x_get_register(struct si470x_device *radio, int regnr) |
| { |
| - u16 buf[READ_REG_NUM]; |
| + __be16 buf[READ_REG_NUM]; |
| struct i2c_msg msgs[1] = { |
| { |
| .addr = radio->client->addr, |
| @@ -121,7 +121,7 @@ int si470x_get_register(struct si470x_de |
| int si470x_set_register(struct si470x_device *radio, int regnr) |
| { |
| int i; |
| - u16 buf[WRITE_REG_NUM]; |
| + __be16 buf[WRITE_REG_NUM]; |
| struct i2c_msg msgs[1] = { |
| { |
| .addr = radio->client->addr, |
| @@ -151,7 +151,7 @@ int si470x_set_register(struct si470x_de |
| static int si470x_get_all_registers(struct si470x_device *radio) |
| { |
| int i; |
| - u16 buf[READ_REG_NUM]; |
| + __be16 buf[READ_REG_NUM]; |
| struct i2c_msg msgs[1] = { |
| { |
| .addr = radio->client->addr, |