Skip to content

Commit 19d933c

Browse files
jwrdegoedeHans Verkuil
authored andcommitted
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 <[email protected]> Reviewed-by: Andy Shevchenko <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Hans Verkuil <[email protected]>
1 parent 9d0643d commit 19d933c

File tree

1 file changed

+13
-21
lines changed

1 file changed

+13
-21
lines changed

drivers/staging/media/atomisp/pci/atomisp_v4l2.c

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,6 @@ module_param(dbg_func, int, 0644);
6666
MODULE_PARM_DESC(dbg_func,
6767
"log function switch non/printk (default:printk)");
6868

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-
7369
/*
7470
* Set to 16x16 since this is the amount of lines and pixels the sensor
7571
* exports extra. If these are kept at the 10x8 that they were on, in yuv
@@ -1101,23 +1097,19 @@ atomisp_load_firmware(struct atomisp_device *isp)
11011097
int rc;
11021098
char *fw_path = NULL;
11031099

1104-
if (firmware_name[0] != '\0') {
1105-
fw_path = firmware_name;
1106-
} else {
1107-
if ((isp->media_dev.hw_revision >> ATOMISP_HW_REVISION_SHIFT)
1108-
== ATOMISP_HW_REVISION_ISP2401)
1109-
fw_path = "shisp_2401a0_v21.bin";
1110-
1111-
if (isp->media_dev.hw_revision ==
1112-
((ATOMISP_HW_REVISION_ISP2401_LEGACY << ATOMISP_HW_REVISION_SHIFT)
1113-
| ATOMISP_HW_STEPPING_A0))
1114-
fw_path = "shisp_2401a0_legacy_v21.bin";
1115-
1116-
if (isp->media_dev.hw_revision ==
1117-
((ATOMISP_HW_REVISION_ISP2400 << ATOMISP_HW_REVISION_SHIFT)
1118-
| ATOMISP_HW_STEPPING_B0))
1119-
fw_path = "shisp_2400b0_v21.bin";
1120-
}
1100+
if ((isp->media_dev.hw_revision >> ATOMISP_HW_REVISION_SHIFT) ==
1101+
ATOMISP_HW_REVISION_ISP2401)
1102+
fw_path = "shisp_2401a0_v21.bin";
1103+
1104+
if (isp->media_dev.hw_revision ==
1105+
((ATOMISP_HW_REVISION_ISP2401_LEGACY << ATOMISP_HW_REVISION_SHIFT) |
1106+
ATOMISP_HW_STEPPING_A0))
1107+
fw_path = "shisp_2401a0_legacy_v21.bin";
1108+
1109+
if (isp->media_dev.hw_revision ==
1110+
((ATOMISP_HW_REVISION_ISP2400 << ATOMISP_HW_REVISION_SHIFT) |
1111+
ATOMISP_HW_STEPPING_B0))
1112+
fw_path = "shisp_2400b0_v21.bin";
11211113

11221114
if (!fw_path) {
11231115
dev_err(isp->dev, "Unsupported hw_revision 0x%x\n",

0 commit comments

Comments
 (0)