On Thu, 10 Nov 2005, Christoph Hellwig wrote: > 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. Sure, sounds reasonable -- perhaps we can get some consensus from the list and come up with the date (arbitrary as it may be), at least it would motivate those affected (QLogic)... > > +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? I'm inclined to drop the help-text entirely for the firmware-module entries, as I'm not sure one needs more info than the menu-item: [ ] Build QLogic ISP2100 firmware-module already states. What were you looking for? > > +#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. As this patchset looks to be more 2.6.16 material, I'll redo the patches with this change along with any additional feedback and a few minor bits. James, would you like me to resubmit now for staging in scsi-misc-2.6 for 2.6.16? -- av - : 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
