upgrade-path to 5.4

Hi.

I have two NFS-servers, one running 5.2-current from
Feb 18 2004 and the other 5.3 beta 3. They are both
equipped with a qlogic 2310 hba, and one with a
aic7899 adapter, PIII at 1 GHz (DL380 G2). They are
serving 8 webservers. Both are very stable.

I'll have some downtime next week and 5.4 won't be
ready by then, but will the upgrade to 5.4 be easier
doing an incremental 5.3->5.4-upgrade, or should I
just go straight to 5.4 (and wait some weeks)?

Does the qlogic card no longer require both

device  isp
device  ispfw

but only device isp in either 5.3 or 5.4?

regards
Claus