tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

media: atomisp: Remove firmware_name module parameter

There is no need for the user to be able to specify a different
name for the firmware being loaded. Most other kernel drivers do not
have this and work fine without it.

Drop this unnecessary module parameter.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Andy Shevchenko <andy@kernel.org>
Link: https://lore.kernel.org/r/20240603132057.255917-2-hdegoede@redhat.com
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>

authored by

Hans de Goede and committed by
Hans Verkuil 19d933cf 9d0643da

+11 -19
+11 -19
drivers/staging/media/atomisp/pci/atomisp_v4l2.c
··· 66 66 MODULE_PARM_DESC(dbg_func, 67 67 "log function switch non/printk (default:printk)"); 68 68 69 - static char firmware_name[256]; 70 - module_param_string(firmware_name, firmware_name, sizeof(firmware_name), 0); 71 - MODULE_PARM_DESC(firmware_name, "Firmware file name. Allows overriding the default firmware name."); 72 - 73 69 /* 74 70 * Set to 16x16 since this is the amount of lines and pixels the sensor 75 71 * exports extra. If these are kept at the 10x8 that they were on, in yuv ··· 1097 1101 int rc; 1098 1102 char *fw_path = NULL; 1099 1103 1100 - if (firmware_name[0] != '\0') { 1101 - fw_path = firmware_name; 1102 - } else { 1103 - if ((isp->media_dev.hw_revision >> ATOMISP_HW_REVISION_SHIFT) 1104 - == ATOMISP_HW_REVISION_ISP2401) 1105 - fw_path = "shisp_2401a0_v21.bin"; 1104 + if ((isp->media_dev.hw_revision >> ATOMISP_HW_REVISION_SHIFT) == 1105 + ATOMISP_HW_REVISION_ISP2401) 1106 + fw_path = "shisp_2401a0_v21.bin"; 1106 1107 1107 - if (isp->media_dev.hw_revision == 1108 - ((ATOMISP_HW_REVISION_ISP2401_LEGACY << ATOMISP_HW_REVISION_SHIFT) 1109 - | ATOMISP_HW_STEPPING_A0)) 1110 - fw_path = "shisp_2401a0_legacy_v21.bin"; 1108 + if (isp->media_dev.hw_revision == 1109 + ((ATOMISP_HW_REVISION_ISP2401_LEGACY << ATOMISP_HW_REVISION_SHIFT) | 1110 + ATOMISP_HW_STEPPING_A0)) 1111 + fw_path = "shisp_2401a0_legacy_v21.bin"; 1111 1112 1112 - if (isp->media_dev.hw_revision == 1113 - ((ATOMISP_HW_REVISION_ISP2400 << ATOMISP_HW_REVISION_SHIFT) 1114 - | ATOMISP_HW_STEPPING_B0)) 1115 - fw_path = "shisp_2400b0_v21.bin"; 1116 - } 1113 + if (isp->media_dev.hw_revision == 1114 + ((ATOMISP_HW_REVISION_ISP2400 << ATOMISP_HW_REVISION_SHIFT) | 1115 + ATOMISP_HW_STEPPING_B0)) 1116 + fw_path = "shisp_2400b0_v21.bin"; 1117 1117 1118 1118 if (!fw_path) { 1119 1119 dev_err(isp->dev, "Unsupported hw_revision 0x%x\n",