Re: [PATCH v2 06/10] staging: media: zoran: fusion all modules
From: Dan Carpenter <hidden>
Date: 2021-10-14 07:57:15
Also in:
linux-media, lkml
From: Dan Carpenter <hidden>
Date: 2021-10-14 07:57:15
Also in:
linux-media, lkml
On Wed, Oct 13, 2021 at 06:58:08PM +0000, Corentin Labbe wrote:
+static int load_codec(struct zoran *zr, u16 codecid)
+{
+ switch (codecid) {
+ case CODEC_TYPE_ZR36060:
+#ifdef CONFIG_VIDEO_ZORAN_ZR36060
+ return zr36060_init_module();
+#else
+ pci_err(zr->pci_dev, "ZR36060 support is not enabled\n");
+ return -EINVAL;
+#endif
+ break;
+ case CODEC_TYPE_ZR36050:
+#ifdef CONFIG_VIDEO_ZORAN_DC30
+ return zr36050_init_module();
+#else
+ pci_err(zr->pci_dev, "ZR36050 support is not enabled\n");
+ return -EINVAL;
+#endif
+ break;
+ case CODEC_TYPE_ZR36016:
+#ifdef CONFIG_VIDEO_ZORAN_DC30
+ return zr36016_init_module();
+#else
+ pci_err(zr->pci_dev, "ZR36016 support is not enabled\n");
+ return -EINVAL;
+#endif
The caller already prints an error message. Can you look through the
dmesg and make sure were not printing a bunch of duplicate stuff? Also
if load_codec() fails, the probe function still does
zoran_setup_videocodec() on the failed codec.
These would be better in a .h file.
#ifdef CONFIG_VIDEO_ZORAN_ZR36060
int zr36060_init_module(void);
#else
int zr36060_init_module(void) { return -EINVAL; }
#endif
regards,
dan carpenter