[PATCH v2] [media] coda: add Freescale firmware compatibility location
The Freescale provided imx-vpu looks for firmware files under /lib/firmware/vpu
by default. Make coda look there for firmware files to ease the update path.
Cc: Fabio Estevam
Signed-off-by: Baruch Siach
---
v2: add compatibility path; don't change existing path (Fabio)
---
drivers/media/platform/coda/coda-common.c | 4
1 file changed, 4 insertions(+)
diff --git a/drivers/media/platform/coda/coda-common.c
b/drivers/media/platform/coda/coda-common.c
index 9e6bdafa16f5..ce0d00f3f3ba 100644
--- a/drivers/media/platform/coda/coda-common.c
+++ b/drivers/media/platform/coda/coda-common.c
@@ -2079,6 +2079,7 @@ static const struct coda_devtype coda_devdata[] = {
[CODA_IMX27] = {
.firmware = {
"vpu_fw_imx27_TO2.bin",
+ "vpu/vpu_fw_imx27_TO2.bin",
"v4l-codadx6-imx27.bin"
},
.product = CODA_DX6,
@@ -2092,6 +2093,7 @@ static const struct coda_devtype coda_devdata[] = {
[CODA_IMX53] = {
.firmware = {
"vpu_fw_imx53.bin",
+ "vpu/vpu_fw_imx53.bin",
"v4l-coda7541-imx53.bin"
},
.product = CODA_7541,
@@ -2106,6 +2108,7 @@ static const struct coda_devtype coda_devdata[] = {
[CODA_IMX6Q] = {
.firmware = {
"vpu_fw_imx6q.bin",
+ "vpu/vpu_fw_imx6q.bin",
"v4l-coda960-imx6q.bin"
},
.product = CODA_960,
@@ -2120,6 +2123,7 @@ static const struct coda_devtype coda_devdata[] = {
[CODA_IMX6DL] = {
.firmware = {
"vpu_fw_imx6d.bin",
+ "vpu/vpu_fw_imx6d.bin",
"v4l-coda960-imx6dl.bin"
},
.product = CODA_960,
--
2.11.0
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2] [media] coda: add Freescale firmware compatibility location
Hi Baruch,
[auto build test WARNING on linuxtv-media/master]
[also build test WARNING on v4.10-rc3 next-20170113]
[if your patch is applied to the wrong git tree, please drop us a note to help
improve the system]
url:
https://github.com/0day-ci/linux/commits/Baruch-Siach/coda-add-Freescale-firmware-compatibility-location/20170115-160508
base: git://linuxtv.org/media_tree.git master
config: arm-imx_v6_v7_defconfig (attached as .config)
compiler: arm-linux-gnueabi-gcc (Debian 6.1.1-9) 6.1.1 20160705
reproduce:
wget
https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross
-O ~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
make.cross ARCH=arm
All warnings (new ones prefixed by >>):
>> drivers/media/platform/coda/coda-common.c:2083:4: warning: excess elements
>> in array initializer
"v4l-codadx6-imx27.bin"
^~~
drivers/media/platform/coda/coda-common.c:2083:4: note: (near initialization
for 'coda_devdata[0].firmware')
drivers/media/platform/coda/coda-common.c:2097:4: warning: excess elements
in array initializer
"v4l-coda7541-imx53.bin"
^~~~
drivers/media/platform/coda/coda-common.c:2097:4: note: (near initialization
for 'coda_devdata[1].firmware')
drivers/media/platform/coda/coda-common.c:2112:4: warning: excess elements
in array initializer
"v4l-coda960-imx6q.bin"
^~~
drivers/media/platform/coda/coda-common.c:2112:4: note: (near initialization
for 'coda_devdata[2].firmware')
drivers/media/platform/coda/coda-common.c:2127:4: warning: excess elements
in array initializer
"v4l-coda960-imx6dl.bin"
^~~~
drivers/media/platform/coda/coda-common.c:2127:4: note: (near initialization
for 'coda_devdata[3].firmware')
vim +2083 drivers/media/platform/coda/coda-common.c
c5d28e29 drivers/media/platform/coda/coda-common.c Ulf Hansson 2014-09-22
2067 put_pm:
c5d28e29 drivers/media/platform/coda/coda-common.c Ulf Hansson 2014-09-22
2068 pm_runtime_put_sync(&pdev->dev);
186b250a drivers/media/video/coda.cJavier Martin 2012-07-26
2069 }
186b250a drivers/media/video/coda.cJavier Martin 2012-07-26
2070
186b250a drivers/media/video/coda.cJavier Martin 2012-07-26
2071 enum coda_platform {
186b250a drivers/media/video/coda.cJavier Martin 2012-07-26
2072 CODA_IMX27,
df1e74cc drivers/media/platform/coda.c Philipp Zabel 2012-07-02
2073 CODA_IMX53,
89548441 drivers/media/platform/coda.c Philipp Zabel 2014-07-11
2074 CODA_IMX6Q,
89548441 drivers/media/platform/coda.c Philipp Zabel 2014-07-11
2075 CODA_IMX6DL,
186b250a drivers/media/video/coda.cJavier Martin 2012-07-26
2076 };
186b250a drivers/media/video/coda.cJavier Martin 2012-07-26
2077
c06d8752 drivers/media/platform/coda.c Emil Goode2012-08-14
2078 static const struct coda_devtype coda_devdata[] = {
186b250a drivers/media/video/coda.cJavier Martin 2012-07-26
2079 [CODA_IMX27] = {
2ac7f08e drivers/media/platform/coda/coda-common.c Philipp Zabel 2016-02-19
2080 .firmware = {
2ac7f08e drivers/media/platform/coda/coda-common.c Philipp Zabel 2016-02-19
2081 "vpu_fw_imx27_TO2.bin",
1ec415b1 drivers/media/platform/coda/coda-common.c Baruch Siach 2017-01-15
2082 "vpu/vpu_fw_imx27_TO2.bin",
2ac7f08e drivers/media/platform/coda/coda-common.c Philipp Zabel 2016-02-19
@2083 "v4l-codadx6-imx27.bin"
2ac7f08e drivers/media/platform/coda/coda-common.c Philipp Zabel 2016-02-19
2084 },
186b250a drivers/media/video/coda.cJavier Martin 2012-07-26
2085 .product = CODA_DX6,
b96904e5 drivers/media/platform/coda.c Philipp Zabel 2013-05-23
2086 .codecs = codadx6_codecs,
b96904e5 drivers/media/platform/coda.c Philipp Zabel 2013-05-23
2087 .num_codecs = ARRAY_SIZE(codadx6_codecs),
2c11d1bd drivers/media/platform/coda/coda-common.c Philipp Zabel 2014-10-02
2088 .vdevs= codadx6_video_devices,
2c11d1bd drivers/media/platform/coda/coda-common.c Philipp Zabel 2014-10-02
2089 .num_vdevs= ARRAY_SIZE(codadx6_video_devices),
e5b0d1c6 drivers/media/platform/coda.c Philipp Zabel 2014-07-11
2090 .workbuf_size = 288 * 1024 + FMO_SLICE_SAVE_BUF_SIZE * 8 *
1024,
401e972f drivers/media/platform/coda.c Philipp Zabel 2014-07-11
2091 .iram_size= 0xb000,
:: The code at
[PATCH v3] [media] coda: add Freescale firmware compatibility location
The Freescale provided imx-vpu looks for firmware files under /lib/firmware/vpu
by default. Make coda look there for firmware files to ease the update path.
Cc: Fabio Estevam
Signed-off-by: Baruch Siach
---
v3: adjust the number of firmware locations in coda_devtype (kbuild test robot)
v2: add compatibility path; don't change existing path (Fabio)
---
drivers/media/platform/coda/coda-common.c | 4
drivers/media/platform/coda/coda.h| 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/media/platform/coda/coda-common.c
b/drivers/media/platform/coda/coda-common.c
index 9e6bdafa16f5..ce0d00f3f3ba 100644
--- a/drivers/media/platform/coda/coda-common.c
+++ b/drivers/media/platform/coda/coda-common.c
@@ -2079,6 +2079,7 @@ static const struct coda_devtype coda_devdata[] = {
[CODA_IMX27] = {
.firmware = {
"vpu_fw_imx27_TO2.bin",
+ "vpu/vpu_fw_imx27_TO2.bin",
"v4l-codadx6-imx27.bin"
},
.product = CODA_DX6,
@@ -2092,6 +2093,7 @@ static const struct coda_devtype coda_devdata[] = {
[CODA_IMX53] = {
.firmware = {
"vpu_fw_imx53.bin",
+ "vpu/vpu_fw_imx53.bin",
"v4l-coda7541-imx53.bin"
},
.product = CODA_7541,
@@ -2106,6 +2108,7 @@ static const struct coda_devtype coda_devdata[] = {
[CODA_IMX6Q] = {
.firmware = {
"vpu_fw_imx6q.bin",
+ "vpu/vpu_fw_imx6q.bin",
"v4l-coda960-imx6q.bin"
},
.product = CODA_960,
@@ -2120,6 +2123,7 @@ static const struct coda_devtype coda_devdata[] = {
[CODA_IMX6DL] = {
.firmware = {
"vpu_fw_imx6d.bin",
+ "vpu/vpu_fw_imx6d.bin",
"v4l-coda960-imx6dl.bin"
},
.product = CODA_960,
diff --git a/drivers/media/platform/coda/coda.h
b/drivers/media/platform/coda/coda.h
index 53f96661683c..8490bcb1fde2 100644
--- a/drivers/media/platform/coda/coda.h
+++ b/drivers/media/platform/coda/coda.h
@@ -50,7 +50,7 @@ enum coda_product {
struct coda_video_device;
struct coda_devtype {
- char*firmware[2];
+ char*firmware[3];
enum coda_product product;
const struct coda_codec *codecs;
unsigned intnum_codecs;
--
2.11.0
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v3] [media] coda: add Freescale firmware compatibility location
On Sun, Jan 15, 2017 at 8:33 AM, Baruch Siach wrote: > The Freescale provided imx-vpu looks for firmware files under > /lib/firmware/vpu > by default. Make coda look there for firmware files to ease the update path. > > Cc: Fabio Estevam > Signed-off-by: Baruch Siach Reviewed-by: Fabio Estevam -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] v4l: subdev: Clean up properly in subdev devnode registration error path
Set the subdev devnode pointer right after registration to ensure that later errors won't skip the subdev when unregistering all devnodes. Signed-off-by: Laurent Pinchart --- drivers/media/v4l2-core/v4l2-device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/v4l2-core/v4l2-device.c b/drivers/media/v4l2-core/v4l2-device.c index 62bbed76dbbc..f364cc1b521d 100644 --- a/drivers/media/v4l2-core/v4l2-device.c +++ b/drivers/media/v4l2-core/v4l2-device.c @@ -253,6 +253,7 @@ int v4l2_device_register_subdev_nodes(struct v4l2_device *v4l2_dev) kfree(vdev); goto clean_up; } + sd->devnode = vdev; #if defined(CONFIG_MEDIA_CONTROLLER) sd->entity.info.dev.major = VIDEO_MAJOR; sd->entity.info.dev.minor = vdev->minor; @@ -270,7 +271,6 @@ int v4l2_device_register_subdev_nodes(struct v4l2_device *v4l2_dev) } } #endif - sd->devnode = vdev; } return 0; -- Regards, Laurent Pinchart -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [OOPS] EM28xx with 4.9.x kernel
Hi ! A workaround for this problem seem to be to enable GPIOLIB in the kernel (Device Drivers -> GPIO support). Regards. /Håkan -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] Staging: media: bcm2048: style fix - bare use of unsigned
Changed bare use of 'unsigned' to the prefered us of 'unsigned int'
found using checkpatch
Signed-off-by: Derek Robson
---
drivers/staging/media/bcm2048/radio-bcm2048.c | 44 +--
1 file changed, 22 insertions(+), 22 deletions(-)
diff --git a/drivers/staging/media/bcm2048/radio-bcm2048.c
b/drivers/staging/media/bcm2048/radio-bcm2048.c
index 37bd439ee08b..b1923a3e4483 100644
--- a/drivers/staging/media/bcm2048/radio-bcm2048.c
+++ b/drivers/staging/media/bcm2048/radio-bcm2048.c
@@ -2020,27 +2020,27 @@ static ssize_t bcm2048_##prop##_read(struct device
*dev,\
return count; \
}
-DEFINE_SYSFS_PROPERTY(power_state, unsigned, int, "%u", 0)
-DEFINE_SYSFS_PROPERTY(mute, unsigned, int, "%u", 0)
-DEFINE_SYSFS_PROPERTY(audio_route, unsigned, int, "%u", 0)
-DEFINE_SYSFS_PROPERTY(dac_output, unsigned, int, "%u", 0)
-
-DEFINE_SYSFS_PROPERTY(fm_hi_lo_injection, unsigned, int, "%u", 0)
-DEFINE_SYSFS_PROPERTY(fm_frequency, unsigned, int, "%u", 0)
-DEFINE_SYSFS_PROPERTY(fm_af_frequency, unsigned, int, "%u", 0)
-DEFINE_SYSFS_PROPERTY(fm_deemphasis, unsigned, int, "%u", 0)
-DEFINE_SYSFS_PROPERTY(fm_rds_mask, unsigned, int, "%u", 0)
-DEFINE_SYSFS_PROPERTY(fm_best_tune_mode, unsigned, int, "%u", 0)
-DEFINE_SYSFS_PROPERTY(fm_search_rssi_threshold, unsigned, int, "%u", 0)
-DEFINE_SYSFS_PROPERTY(fm_search_mode_direction, unsigned, int, "%u", 0)
-DEFINE_SYSFS_PROPERTY(fm_search_tune_mode, unsigned, int, "%u", value > 3)
-
-DEFINE_SYSFS_PROPERTY(rds, unsigned, int, "%u", 0)
-DEFINE_SYSFS_PROPERTY(rds_b_block_mask, unsigned, int, "%u", 0)
-DEFINE_SYSFS_PROPERTY(rds_b_block_match, unsigned, int, "%u", 0)
-DEFINE_SYSFS_PROPERTY(rds_pi_mask, unsigned, int, "%u", 0)
-DEFINE_SYSFS_PROPERTY(rds_pi_match, unsigned, int, "%u", 0)
-DEFINE_SYSFS_PROPERTY(rds_wline, unsigned, int, "%u", 0)
+DEFINE_SYSFS_PROPERTY(power_state, unsigned int, int, "%u", 0)
+DEFINE_SYSFS_PROPERTY(mute, unsigned int, int, "%u", 0)
+DEFINE_SYSFS_PROPERTY(audio_route, unsigned int, int, "%u", 0)
+DEFINE_SYSFS_PROPERTY(dac_output, unsigned int, int, "%u", 0)
+
+DEFINE_SYSFS_PROPERTY(fm_hi_lo_injection, unsigned int, int, "%u", 0)
+DEFINE_SYSFS_PROPERTY(fm_frequency, unsigned int, int, "%u", 0)
+DEFINE_SYSFS_PROPERTY(fm_af_frequency, unsigned int, int, "%u", 0)
+DEFINE_SYSFS_PROPERTY(fm_deemphasis, unsigned int, int, "%u", 0)
+DEFINE_SYSFS_PROPERTY(fm_rds_mask, unsigned int, int, "%u", 0)
+DEFINE_SYSFS_PROPERTY(fm_best_tune_mode, unsigned int, int, "%u", 0)
+DEFINE_SYSFS_PROPERTY(fm_search_rssi_threshold, unsigned int, int, "%u", 0)
+DEFINE_SYSFS_PROPERTY(fm_search_mode_direction, unsigned int, int, "%u", 0)
+DEFINE_SYSFS_PROPERTY(fm_search_tune_mode, unsigned int, int, "%u", value > 3)
+
+DEFINE_SYSFS_PROPERTY(rds, unsigned int, int, "%u", 0)
+DEFINE_SYSFS_PROPERTY(rds_b_block_mask, unsigned int, int, "%u", 0)
+DEFINE_SYSFS_PROPERTY(rds_b_block_match, unsigned int, int, "%u", 0)
+DEFINE_SYSFS_PROPERTY(rds_pi_mask, unsigned int, int, "%u", 0)
+DEFINE_SYSFS_PROPERTY(rds_pi_match, unsigned int, int, "%u", 0)
+DEFINE_SYSFS_PROPERTY(rds_wline, unsigned int, int, "%u", 0)
property_read(rds_pi, unsigned int, "%x")
property_str_read(rds_rt, (BCM2048_MAX_RDS_RT + 1))
property_str_read(rds_ps, (BCM2048_MAX_RDS_PS + 1))
@@ -2052,7 +2052,7 @@ property_read(region_bottom_frequency, unsigned int, "%u")
property_read(region_top_frequency, unsigned int, "%u")
property_signed_read(fm_carrier_error, int, "%d")
property_signed_read(fm_rssi, int, "%d")
-DEFINE_SYSFS_PROPERTY(region, unsigned, int, "%u", 0)
+DEFINE_SYSFS_PROPERTY(region, unsigned int, int, "%u", 0)
static struct device_attribute attrs[] = {
__ATTR(power_state, 0644, bcm2048_power_state_read,
--
2.11.0
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] Staging: media: bcm2048: style fix - bare use of unsigned
> On Jan 15, 2017, at 10:30 PM, Derek Robson wrote:
>
> Changed bare use of 'unsigned' to the prefered us of 'unsigned int'
> found using checkpatch
Just wondering if you compiled? This patch looks exactly like a patch I tried,
but it didn't compile.
> Signed-off-by: Derek Robson
> ---
> drivers/staging/media/bcm2048/radio-bcm2048.c | 44 +--
> 1 file changed, 22 insertions(+), 22 deletions(-)
>
> diff --git a/drivers/staging/media/bcm2048/radio-bcm2048.c
> b/drivers/staging/media/bcm2048/radio-bcm2048.c
> index 37bd439ee08b..b1923a3e4483 100644
> --- a/drivers/staging/media/bcm2048/radio-bcm2048.c
> +++ b/drivers/staging/media/bcm2048/radio-bcm2048.c
> @@ -2020,27 +2020,27 @@ static ssize_t bcm2048_##prop##_read(struct device
> *dev,\
>return count;\
> }
>
> -DEFINE_SYSFS_PROPERTY(power_state, unsigned, int, "%u", 0)
> -DEFINE_SYSFS_PROPERTY(mute, unsigned, int, "%u", 0)
> -DEFINE_SYSFS_PROPERTY(audio_route, unsigned, int, "%u", 0)
> -DEFINE_SYSFS_PROPERTY(dac_output, unsigned, int, "%u", 0)
> -
> -DEFINE_SYSFS_PROPERTY(fm_hi_lo_injection, unsigned, int, "%u", 0)
> -DEFINE_SYSFS_PROPERTY(fm_frequency, unsigned, int, "%u", 0)
> -DEFINE_SYSFS_PROPERTY(fm_af_frequency, unsigned, int, "%u", 0)
> -DEFINE_SYSFS_PROPERTY(fm_deemphasis, unsigned, int, "%u", 0)
> -DEFINE_SYSFS_PROPERTY(fm_rds_mask, unsigned, int, "%u", 0)
> -DEFINE_SYSFS_PROPERTY(fm_best_tune_mode, unsigned, int, "%u", 0)
> -DEFINE_SYSFS_PROPERTY(fm_search_rssi_threshold, unsigned, int, "%u", 0)
> -DEFINE_SYSFS_PROPERTY(fm_search_mode_direction, unsigned, int, "%u", 0)
> -DEFINE_SYSFS_PROPERTY(fm_search_tune_mode, unsigned, int, "%u", value > 3)
> -
> -DEFINE_SYSFS_PROPERTY(rds, unsigned, int, "%u", 0)
> -DEFINE_SYSFS_PROPERTY(rds_b_block_mask, unsigned, int, "%u", 0)
> -DEFINE_SYSFS_PROPERTY(rds_b_block_match, unsigned, int, "%u", 0)
> -DEFINE_SYSFS_PROPERTY(rds_pi_mask, unsigned, int, "%u", 0)
> -DEFINE_SYSFS_PROPERTY(rds_pi_match, unsigned, int, "%u", 0)
> -DEFINE_SYSFS_PROPERTY(rds_wline, unsigned, int, "%u", 0)
> +DEFINE_SYSFS_PROPERTY(power_state, unsigned int, int, "%u", 0)
> +DEFINE_SYSFS_PROPERTY(mute, unsigned int, int, "%u", 0)
> +DEFINE_SYSFS_PROPERTY(audio_route, unsigned int, int, "%u", 0)
> +DEFINE_SYSFS_PROPERTY(dac_output, unsigned int, int, "%u", 0)
> +
> +DEFINE_SYSFS_PROPERTY(fm_hi_lo_injection, unsigned int, int, "%u", 0)
> +DEFINE_SYSFS_PROPERTY(fm_frequency, unsigned int, int, "%u", 0)
> +DEFINE_SYSFS_PROPERTY(fm_af_frequency, unsigned int, int, "%u", 0)
> +DEFINE_SYSFS_PROPERTY(fm_deemphasis, unsigned int, int, "%u", 0)
> +DEFINE_SYSFS_PROPERTY(fm_rds_mask, unsigned int, int, "%u", 0)
> +DEFINE_SYSFS_PROPERTY(fm_best_tune_mode, unsigned int, int, "%u", 0)
> +DEFINE_SYSFS_PROPERTY(fm_search_rssi_threshold, unsigned int, int, "%u", 0)
> +DEFINE_SYSFS_PROPERTY(fm_search_mode_direction, unsigned int, int, "%u", 0)
> +DEFINE_SYSFS_PROPERTY(fm_search_tune_mode, unsigned int, int, "%u", value >
> 3)
> +
> +DEFINE_SYSFS_PROPERTY(rds, unsigned int, int, "%u", 0)
> +DEFINE_SYSFS_PROPERTY(rds_b_block_mask, unsigned int, int, "%u", 0)
> +DEFINE_SYSFS_PROPERTY(rds_b_block_match, unsigned int, int, "%u", 0)
> +DEFINE_SYSFS_PROPERTY(rds_pi_mask, unsigned int, int, "%u", 0)
> +DEFINE_SYSFS_PROPERTY(rds_pi_match, unsigned int, int, "%u", 0)
> +DEFINE_SYSFS_PROPERTY(rds_wline, unsigned int, int, "%u", 0)
> property_read(rds_pi, unsigned int, "%x")
> property_str_read(rds_rt, (BCM2048_MAX_RDS_RT + 1))
> property_str_read(rds_ps, (BCM2048_MAX_RDS_PS + 1))
> @@ -2052,7 +2052,7 @@ property_read(region_bottom_frequency, unsigned int,
> "%u")
> property_read(region_top_frequency, unsigned int, "%u")
> property_signed_read(fm_carrier_error, int, "%d")
> property_signed_read(fm_rssi, int, "%d")
> -DEFINE_SYSFS_PROPERTY(region, unsigned, int, "%u", 0)
> +DEFINE_SYSFS_PROPERTY(region, unsigned int, int, "%u", 0)
>
> static struct device_attribute attrs[] = {
>__ATTR(power_state, 0644, bcm2048_power_state_read,
> --
> 2.11.0
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] Staging: media: bcm2048: style fix - bare use of unsigned
Hi Derek, [auto build test ERROR on linuxtv-media/master] [also build test ERROR on v4.10-rc4 next-20170113] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] url: https://github.com/0day-ci/linux/commits/Derek-Robson/Staging-media-bcm2048-style-fix-bare-use-of-unsigned/20170116-123500 base: git://linuxtv.org/media_tree.git master config: i386-randconfig-x005-201703 (attached as .config) compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901 reproduce: # save the attached .config to linux build tree make ARCH=i386 All error/warnings (new ones prefixed by >>): drivers/staging/media/bcm2048/radio-bcm2048.c: In function 'bcm2048_power_state_write': >> drivers/staging/media/bcm2048/radio-bcm2048.c:2023:50: error: two or more >> data types in declaration specifiers DEFINE_SYSFS_PROPERTY(power_state, unsigned int, int, "%u", 0) ^ drivers/staging/media/bcm2048/radio-bcm2048.c:1943:2: note: in definition of macro 'property_write' type value; \ ^~~~ >> drivers/staging/media/bcm2048/radio-bcm2048.c:2023:1: note: in expansion of >> macro 'DEFINE_SYSFS_PROPERTY' DEFINE_SYSFS_PROPERTY(power_state, unsigned int, int, "%u", 0) ^ drivers/staging/media/bcm2048/radio-bcm2048.c: In function 'bcm2048_mute_write': drivers/staging/media/bcm2048/radio-bcm2048.c:2024:43: error: two or more data types in declaration specifiers DEFINE_SYSFS_PROPERTY(mute, unsigned int, int, "%u", 0) ^ drivers/staging/media/bcm2048/radio-bcm2048.c:1943:2: note: in definition of macro 'property_write' type value; \ ^~~~ drivers/staging/media/bcm2048/radio-bcm2048.c:2024:1: note: in expansion of macro 'DEFINE_SYSFS_PROPERTY' DEFINE_SYSFS_PROPERTY(mute, unsigned int, int, "%u", 0) ^ drivers/staging/media/bcm2048/radio-bcm2048.c: In function 'bcm2048_audio_route_write': drivers/staging/media/bcm2048/radio-bcm2048.c:2025:50: error: two or more data types in declaration specifiers DEFINE_SYSFS_PROPERTY(audio_route, unsigned int, int, "%u", 0) ^ drivers/staging/media/bcm2048/radio-bcm2048.c:1943:2: note: in definition of macro 'property_write' type value; \ ^~~~ drivers/staging/media/bcm2048/radio-bcm2048.c:2025:1: note: in expansion of macro 'DEFINE_SYSFS_PROPERTY' DEFINE_SYSFS_PROPERTY(audio_route, unsigned int, int, "%u", 0) ^ drivers/staging/media/bcm2048/radio-bcm2048.c: In function 'bcm2048_dac_output_write': drivers/staging/media/bcm2048/radio-bcm2048.c:2026:49: error: two or more data types in declaration specifiers DEFINE_SYSFS_PROPERTY(dac_output, unsigned int, int, "%u", 0) ^ drivers/staging/media/bcm2048/radio-bcm2048.c:1943:2: note: in definition of macro 'property_write' type value; \ ^~~~ drivers/staging/media/bcm2048/radio-bcm2048.c:2026:1: note: in expansion of macro 'DEFINE_SYSFS_PROPERTY' DEFINE_SYSFS_PROPERTY(dac_output, unsigned int, int, "%u", 0) ^ drivers/staging/media/bcm2048/radio-bcm2048.c: In function 'bcm2048_fm_hi_lo_injection_write': drivers/staging/media/bcm2048/radio-bcm2048.c:2028:57: error: two or more data types in declaration specifiers DEFINE_SYSFS_PROPERTY(fm_hi_lo_injection, unsigned int, int, "%u", 0) ^ drivers/staging/media/bcm2048/radio-bcm2048.c:1943:2: note: in definition of macro 'property_write' type value; \ ^~~~ drivers/staging/media/bcm2048/radio-bcm2048.c:2028:1: note: in expansion of macro 'DEFINE_SYSFS_PROPERTY' DEFINE_SYSFS_PROPERTY(fm_hi_lo_injection, unsigned int, int, "%u", 0) ^ drivers/staging/media/bcm2048/radio-bcm2048.c: In function 'bcm2048_fm_frequency_write': drivers/staging/media/bcm2048/radio-bcm2048.c:2029:51: error: two or more data types in declaration specifiers DEFINE_SYSFS_PROPERTY(fm_frequency, unsigned int, int, "%u", 0) ^ drivers/staging/media/bcm2048/radio-bcm2048.c:1943:2: note: in definition of macro 'property_write' type value; \ ^~~~ drivers/staging/media/bcm2048/radio-bcm2048.c:2029:1: note: in expansion of macro 'DEFINE_SYSFS_PROPERTY' DEFINE_SYSFS_PROPERTY(fm_frequency, unsigned int, int, "%u", 0) ^ drivers/staging/media/bcm2048/radio-bcm2048.c: In function 'bcm2048_fm_af_frequency_write': drivers/staging/media/bcm2048/radio-bcm2048.c:2030:54: error: two or more data types in declaration specifiers DEFINE_SYSFS_PROPERTY(fm_af_frequency, unsigned int, int, "%u", 0)
Re: [PATCH] Staging: media: bcm2048: style fix - bare use of unsigned
On Sun, Jan 15, 2017 at 10:40:02PM -0600, Scott Matheina wrote:
>
>
> > On Jan 15, 2017, at 10:30 PM, Derek Robson wrote:
> >
> > Changed bare use of 'unsigned' to the prefered us of 'unsigned int'
> > found using checkpatch
>
> Just wondering if you compiled? This patch looks exactly like a patch I
> tried, but it didn't compile.
>
It complied for me, I am on an X86 system.
> > Signed-off-by: Derek Robson
> > ---
> > drivers/staging/media/bcm2048/radio-bcm2048.c | 44
> > +--
> > 1 file changed, 22 insertions(+), 22 deletions(-)
> >
> > diff --git a/drivers/staging/media/bcm2048/radio-bcm2048.c
> > b/drivers/staging/media/bcm2048/radio-bcm2048.c
> > index 37bd439ee08b..b1923a3e4483 100644
> > --- a/drivers/staging/media/bcm2048/radio-bcm2048.c
> > +++ b/drivers/staging/media/bcm2048/radio-bcm2048.c
> > @@ -2020,27 +2020,27 @@ static ssize_t bcm2048_##prop##_read(struct device
> > *dev,\
> >return count;\
> > }
> >
> > -DEFINE_SYSFS_PROPERTY(power_state, unsigned, int, "%u", 0)
> > -DEFINE_SYSFS_PROPERTY(mute, unsigned, int, "%u", 0)
> > -DEFINE_SYSFS_PROPERTY(audio_route, unsigned, int, "%u", 0)
> > -DEFINE_SYSFS_PROPERTY(dac_output, unsigned, int, "%u", 0)
> > -
> > -DEFINE_SYSFS_PROPERTY(fm_hi_lo_injection, unsigned, int, "%u", 0)
> > -DEFINE_SYSFS_PROPERTY(fm_frequency, unsigned, int, "%u", 0)
> > -DEFINE_SYSFS_PROPERTY(fm_af_frequency, unsigned, int, "%u", 0)
> > -DEFINE_SYSFS_PROPERTY(fm_deemphasis, unsigned, int, "%u", 0)
> > -DEFINE_SYSFS_PROPERTY(fm_rds_mask, unsigned, int, "%u", 0)
> > -DEFINE_SYSFS_PROPERTY(fm_best_tune_mode, unsigned, int, "%u", 0)
> > -DEFINE_SYSFS_PROPERTY(fm_search_rssi_threshold, unsigned, int, "%u", 0)
> > -DEFINE_SYSFS_PROPERTY(fm_search_mode_direction, unsigned, int, "%u", 0)
> > -DEFINE_SYSFS_PROPERTY(fm_search_tune_mode, unsigned, int, "%u", value > 3)
> > -
> > -DEFINE_SYSFS_PROPERTY(rds, unsigned, int, "%u", 0)
> > -DEFINE_SYSFS_PROPERTY(rds_b_block_mask, unsigned, int, "%u", 0)
> > -DEFINE_SYSFS_PROPERTY(rds_b_block_match, unsigned, int, "%u", 0)
> > -DEFINE_SYSFS_PROPERTY(rds_pi_mask, unsigned, int, "%u", 0)
> > -DEFINE_SYSFS_PROPERTY(rds_pi_match, unsigned, int, "%u", 0)
> > -DEFINE_SYSFS_PROPERTY(rds_wline, unsigned, int, "%u", 0)
> > +DEFINE_SYSFS_PROPERTY(power_state, unsigned int, int, "%u", 0)
> > +DEFINE_SYSFS_PROPERTY(mute, unsigned int, int, "%u", 0)
> > +DEFINE_SYSFS_PROPERTY(audio_route, unsigned int, int, "%u", 0)
> > +DEFINE_SYSFS_PROPERTY(dac_output, unsigned int, int, "%u", 0)
> > +
> > +DEFINE_SYSFS_PROPERTY(fm_hi_lo_injection, unsigned int, int, "%u", 0)
> > +DEFINE_SYSFS_PROPERTY(fm_frequency, unsigned int, int, "%u", 0)
> > +DEFINE_SYSFS_PROPERTY(fm_af_frequency, unsigned int, int, "%u", 0)
> > +DEFINE_SYSFS_PROPERTY(fm_deemphasis, unsigned int, int, "%u", 0)
> > +DEFINE_SYSFS_PROPERTY(fm_rds_mask, unsigned int, int, "%u", 0)
> > +DEFINE_SYSFS_PROPERTY(fm_best_tune_mode, unsigned int, int, "%u", 0)
> > +DEFINE_SYSFS_PROPERTY(fm_search_rssi_threshold, unsigned int, int, "%u", 0)
> > +DEFINE_SYSFS_PROPERTY(fm_search_mode_direction, unsigned int, int, "%u", 0)
> > +DEFINE_SYSFS_PROPERTY(fm_search_tune_mode, unsigned int, int, "%u", value
> > > 3)
> > +
> > +DEFINE_SYSFS_PROPERTY(rds, unsigned int, int, "%u", 0)
> > +DEFINE_SYSFS_PROPERTY(rds_b_block_mask, unsigned int, int, "%u", 0)
> > +DEFINE_SYSFS_PROPERTY(rds_b_block_match, unsigned int, int, "%u", 0)
> > +DEFINE_SYSFS_PROPERTY(rds_pi_mask, unsigned int, int, "%u", 0)
> > +DEFINE_SYSFS_PROPERTY(rds_pi_match, unsigned int, int, "%u", 0)
> > +DEFINE_SYSFS_PROPERTY(rds_wline, unsigned int, int, "%u", 0)
> > property_read(rds_pi, unsigned int, "%x")
> > property_str_read(rds_rt, (BCM2048_MAX_RDS_RT + 1))
> > property_str_read(rds_ps, (BCM2048_MAX_RDS_PS + 1))
> > @@ -2052,7 +2052,7 @@ property_read(region_bottom_frequency, unsigned int,
> > "%u")
> > property_read(region_top_frequency, unsigned int, "%u")
> > property_signed_read(fm_carrier_error, int, "%d")
> > property_signed_read(fm_rssi, int, "%d")
> > -DEFINE_SYSFS_PROPERTY(region, unsigned, int, "%u", 0)
> > +DEFINE_SYSFS_PROPERTY(region, unsigned int, int, "%u", 0)
> >
> > static struct device_attribute attrs[] = {
> >__ATTR(power_state, 0644, bcm2048_power_state_read,
> > --
> > 2.11.0
>
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
cron job: media_tree daily build: ERRORS
This message is generated daily by a cron job that builds media_tree for the kernels and architectures in the list below. Results of the daily build of media_tree: date: Mon Jan 16 05:00:17 CET 2017 media-tree git hash:40eca140c404505c09773d1c6685d818cb55ab1a media_build git hash: 3c6ce4ff75f19adf45869e34b376c5b9dee4d50a v4l-utils git hash: aded25f433113e022adc375629c8e17eb3a5c64f gcc version:i686-linux-gcc (GCC) 6.2.0 sparse version: v0.5.0-3553-g78b2ea6 smatch version: v0.5.0-3553-g78b2ea6 host hardware: x86_64 host os:4.8.0-164 linux-git-arm-at91: OK linux-git-arm-davinci: OK linux-git-arm-multi: OK linux-git-arm-pxa: OK linux-git-blackfin-bf561: OK linux-git-i686: OK linux-git-m32r: OK linux-git-mips: OK linux-git-powerpc64: OK linux-git-sh: OK linux-git-x86_64: OK linux-2.6.36.4-i686: WARNINGS linux-2.6.37.6-i686: WARNINGS linux-2.6.38.8-i686: WARNINGS linux-2.6.39.4-i686: WARNINGS linux-3.0.60-i686: WARNINGS linux-3.1.10-i686: WARNINGS linux-3.2.37-i686: WARNINGS linux-3.3.8-i686: WARNINGS linux-3.4.27-i686: WARNINGS linux-3.5.7-i686: WARNINGS linux-3.6.11-i686: WARNINGS linux-3.7.4-i686: WARNINGS linux-3.8-i686: WARNINGS linux-3.9.2-i686: WARNINGS linux-3.10.1-i686: WARNINGS linux-3.11.1-i686: OK linux-3.12.67-i686: OK linux-3.13.11-i686: WARNINGS linux-3.14.9-i686: WARNINGS linux-3.15.2-i686: WARNINGS linux-3.16.7-i686: WARNINGS linux-3.17.8-i686: WARNINGS linux-3.18.7-i686: WARNINGS linux-3.19-i686: WARNINGS linux-4.0.9-i686: WARNINGS linux-4.1.33-i686: WARNINGS linux-4.2.8-i686: WARNINGS linux-4.3.6-i686: WARNINGS linux-4.4.22-i686: WARNINGS linux-4.5.7-i686: WARNINGS linux-4.6.7-i686: WARNINGS linux-4.7.5-i686: WARNINGS linux-4.8-i686: OK linux-4.9-i686: OK linux-4.10-rc3-i686: OK linux-2.6.36.4-x86_64: WARNINGS linux-2.6.37.6-x86_64: WARNINGS linux-2.6.38.8-x86_64: WARNINGS linux-2.6.39.4-x86_64: WARNINGS linux-3.0.60-x86_64: WARNINGS linux-3.1.10-x86_64: WARNINGS linux-3.2.37-x86_64: WARNINGS linux-3.3.8-x86_64: WARNINGS linux-3.4.27-x86_64: WARNINGS linux-3.5.7-x86_64: WARNINGS linux-3.6.11-x86_64: WARNINGS linux-3.7.4-x86_64: WARNINGS linux-3.8-x86_64: WARNINGS linux-3.9.2-x86_64: WARNINGS linux-3.10.1-x86_64: WARNINGS linux-3.11.1-x86_64: OK linux-3.12.67-x86_64: OK linux-3.13.11-x86_64: WARNINGS linux-3.14.9-x86_64: WARNINGS linux-3.15.2-x86_64: WARNINGS linux-3.16.7-x86_64: WARNINGS linux-3.17.8-x86_64: WARNINGS linux-3.18.7-x86_64: WARNINGS linux-3.19-x86_64: WARNINGS linux-4.0.9-x86_64: WARNINGS linux-4.1.33-x86_64: WARNINGS linux-4.2.8-x86_64: WARNINGS linux-4.3.6-x86_64: WARNINGS linux-4.4.22-x86_64: WARNINGS linux-4.5.7-x86_64: WARNINGS linux-4.6.7-x86_64: WARNINGS linux-4.7.5-x86_64: WARNINGS linux-4.8-x86_64: OK linux-4.9-x86_64: OK linux-4.10-rc3-x86_64: OK apps: WARNINGS spec-git: ERRORS sparse: WARNINGS Detailed results are available here: http://www.xs4all.nl/~hverkuil/logs/Monday.log Full logs are available here: http://www.xs4all.nl/~hverkuil/logs/Monday.tar.bz2 The Media Infrastructure API from this daily build is here: http://www.xs4all.nl/~hverkuil/spec/index.html -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH V2] Staging: media: bcm2048: style fix - bare use of unsigned
Changed macro to not pass signedness and size as seprate fields.
This is to improve code readablity.
Signed-off-by: Derek Robson
---
version #1 broke the build because I missunderstood the output of checkpatch.
drivers/staging/media/bcm2048/radio-bcm2048.c | 48 +--
1 file changed, 24 insertions(+), 24 deletions(-)
diff --git a/drivers/staging/media/bcm2048/radio-bcm2048.c
b/drivers/staging/media/bcm2048/radio-bcm2048.c
index 37bd439ee08b..db889c0943d5 100644
--- a/drivers/staging/media/bcm2048/radio-bcm2048.c
+++ b/drivers/staging/media/bcm2048/radio-bcm2048.c
@@ -1992,8 +1992,8 @@ static ssize_t bcm2048_##prop##_read(struct device *dev,
\
return sprintf(buf, mask "\n", value); \
}
-#define DEFINE_SYSFS_PROPERTY(prop, signal, size, mask, check) \
-property_write(prop, signal size, mask, check) \
+#define DEFINE_SYSFS_PROPERTY(prop, size, mask, check) \
+property_write(prop, size, mask, check)\
property_read(prop, size, mask)
#define property_str_read(prop, size) \
@@ -2020,27 +2020,27 @@ static ssize_t bcm2048_##prop##_read(struct device
*dev,\
return count; \
}
-DEFINE_SYSFS_PROPERTY(power_state, unsigned, int, "%u", 0)
-DEFINE_SYSFS_PROPERTY(mute, unsigned, int, "%u", 0)
-DEFINE_SYSFS_PROPERTY(audio_route, unsigned, int, "%u", 0)
-DEFINE_SYSFS_PROPERTY(dac_output, unsigned, int, "%u", 0)
-
-DEFINE_SYSFS_PROPERTY(fm_hi_lo_injection, unsigned, int, "%u", 0)
-DEFINE_SYSFS_PROPERTY(fm_frequency, unsigned, int, "%u", 0)
-DEFINE_SYSFS_PROPERTY(fm_af_frequency, unsigned, int, "%u", 0)
-DEFINE_SYSFS_PROPERTY(fm_deemphasis, unsigned, int, "%u", 0)
-DEFINE_SYSFS_PROPERTY(fm_rds_mask, unsigned, int, "%u", 0)
-DEFINE_SYSFS_PROPERTY(fm_best_tune_mode, unsigned, int, "%u", 0)
-DEFINE_SYSFS_PROPERTY(fm_search_rssi_threshold, unsigned, int, "%u", 0)
-DEFINE_SYSFS_PROPERTY(fm_search_mode_direction, unsigned, int, "%u", 0)
-DEFINE_SYSFS_PROPERTY(fm_search_tune_mode, unsigned, int, "%u", value > 3)
-
-DEFINE_SYSFS_PROPERTY(rds, unsigned, int, "%u", 0)
-DEFINE_SYSFS_PROPERTY(rds_b_block_mask, unsigned, int, "%u", 0)
-DEFINE_SYSFS_PROPERTY(rds_b_block_match, unsigned, int, "%u", 0)
-DEFINE_SYSFS_PROPERTY(rds_pi_mask, unsigned, int, "%u", 0)
-DEFINE_SYSFS_PROPERTY(rds_pi_match, unsigned, int, "%u", 0)
-DEFINE_SYSFS_PROPERTY(rds_wline, unsigned, int, "%u", 0)
+DEFINE_SYSFS_PROPERTY(power_state, unsigned int, "%u", 0)
+DEFINE_SYSFS_PROPERTY(mute, unsigned int, "%u", 0)
+DEFINE_SYSFS_PROPERTY(audio_route, unsigned int, "%u", 0)
+DEFINE_SYSFS_PROPERTY(dac_output, unsigned int, "%u", 0)
+
+DEFINE_SYSFS_PROPERTY(fm_hi_lo_injection, unsigned int, "%u", 0)
+DEFINE_SYSFS_PROPERTY(fm_frequency, unsigned int, "%u", 0)
+DEFINE_SYSFS_PROPERTY(fm_af_frequency, unsigned int, "%u", 0)
+DEFINE_SYSFS_PROPERTY(fm_deemphasis, unsigned int, "%u", 0)
+DEFINE_SYSFS_PROPERTY(fm_rds_mask, unsigned int, "%u", 0)
+DEFINE_SYSFS_PROPERTY(fm_best_tune_mode, unsigned int, "%u", 0)
+DEFINE_SYSFS_PROPERTY(fm_search_rssi_threshold, unsigned int, "%u", 0)
+DEFINE_SYSFS_PROPERTY(fm_search_mode_direction, unsigned int, "%u", 0)
+DEFINE_SYSFS_PROPERTY(fm_search_tune_mode, unsigned int, "%u", value > 3)
+
+DEFINE_SYSFS_PROPERTY(rds, unsigned int, "%u", 0)
+DEFINE_SYSFS_PROPERTY(rds_b_block_mask, unsigned int, "%u", 0)
+DEFINE_SYSFS_PROPERTY(rds_b_block_match, unsigned int, "%u", 0)
+DEFINE_SYSFS_PROPERTY(rds_pi_mask, unsigned int, "%u", 0)
+DEFINE_SYSFS_PROPERTY(rds_pi_match, unsigned int, "%u", 0)
+DEFINE_SYSFS_PROPERTY(rds_wline, unsigned int, "%u", 0)
property_read(rds_pi, unsigned int, "%x")
property_str_read(rds_rt, (BCM2048_MAX_RDS_RT + 1))
property_str_read(rds_ps, (BCM2048_MAX_RDS_PS + 1))
@@ -2052,7 +2052,7 @@ property_read(region_bottom_frequency, unsigned int, "%u")
property_read(region_top_frequency, unsigned int, "%u")
property_signed_read(fm_carrier_error, int, "%d")
property_signed_read(fm_rssi, int, "%d")
-DEFINE_SYSFS_PROPERTY(region, unsigned, int, "%u", 0)
+DEFINE_SYSFS_PROPERTY(region, unsigned int, "%u", 0)
static struct device_attribute attrs[] = {
__ATTR(power_state, 0644, bcm2048_power_state_read,
--
2.11.0
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
