this patchkit looks good. one thing we discussed and should go in ontop is a scsi-wide option the firmware depends on, with a clear deprecation date for the builtin firmware. that way we can enforce that all new drivers support request_firmware, but can have in-kernel firmware for until that deprecation date. > +config SCSI_QLA21XX > + tristate " Build QLogic ISP2100 firmware-module" > + depends on SCSI_QLA2XXX_EMBEDDED_FIRMWARE > ---help--- > This driver supports the QLogic 21xx (ISP2100) host adapter family. don't the help-text need some update? > +#if defined(CONFIG_SCSI_QLA2XXX_EMBEDDED_FIRMWARE) > #if defined(CONFIG_SCSI_QLA21XX) || defined(CONFIG_SCSI_QLA21XX_MODULE) > #define IS_QLA2100(ha) ((ha)->pdev->device == PCI_DEVICE_ID_QLOGIC_ISP2100) > #else > @@ -79,9 +81,23 @@ > #define IS_QLA2522(ha) 0 > #endif > > +#else /* !defined(CONFIG_SCSI_QLA2XXX_EMBEDDED_FIRMWARE) */ > + > +#define IS_QLA2100(ha) ((ha)->pdev->device == PCI_DEVICE_ID_QLOGIC_ISP2100) I'd say just use this else clause unconditionally. no need to optimize for the 1% users using the deprecated builtin-firmware and compile just for a subsystet of the supported cards. - : send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
