firmware: pcmcia/ds: prepare for FIRMWARE_NAME_MAX removal (ed62acec) · Commits · 戴 / test

We're going to remove the FIRMWARE_NAME_MAX definition in order to avoid any firmware name length restriction. With the FIRMWARE_NAME_MAX removal, the ds.c reference becomes useless as we dont need to check for the firmware name length anymore. Signed-off-by:

Samuel Ortiz <sameo@linux.intel.com> Cc: Dominik Brodowski <linux@dominikbrodowski.net> Signed-off-by:

Greg Kroah-Hartman <gregkh@suse.de>

drivers/pcmcia/ds.c

+1 −11

Original line number	Diff line number	Diff line
		@@ -828,7 +828,6 @@ static int pcmcia_load_firmware(struct pcmcia_device dev, char filename)
		{
		struct pcmcia_socket *s = dev->socket;
		const struct firmware *fw;
		char path[FIRMWARE_NAME_MAX];
		int ret = -ENOMEM;
		int no_funcs;
		int old_funcs;
		@@ -839,16 +838,7 @@ static int pcmcia_load_firmware(struct pcmcia_device dev, char filename)

		ds_dev_dbg(1, &dev->dev, "trying to load CIS file %s\n", filename);

		if (strlen(filename) > (FIRMWARE_NAME_MAX - 1)) {
		dev_printk(KERN_WARNING, &dev->dev,
		"pcmcia: CIS filename is too long [%s]\n",
		filename);
		return -EINVAL;
		}

		snprintf(path, sizeof(path), "%s", filename);

		if (request_firmware(&fw, path, &dev->dev) == 0) {
		if (request_firmware(&fw, filename, &dev->dev) == 0) {
		if (fw->size >= CISTPL_MAX_CIS_SIZE) {
		ret = -EINVAL;
		dev_printk(KERN_ERR, &dev->dev,

Admin message