summaryrefslogtreecommitdiff
path: root/sys/dev/isp
diff options
context:
space:
mode:
authorMarius Strobl <marius@FreeBSD.org>2006-02-12 22:57:04 +0000
committerMarius Strobl <marius@FreeBSD.org>2006-02-12 22:57:04 +0000
commit817ee68141a5239675f2ae3d4b66e403998ac26b (patch)
tree007565ac04c761a90e0d1d9f898afb912fd92575 /sys/dev/isp
parente66325663a7d41012677a215f50337428770cb72 (diff)
Notes
Diffstat (limited to 'sys/dev/isp')
-rw-r--r--sys/dev/isp/isp_sbus.c18
1 files changed, 7 insertions, 11 deletions
diff --git a/sys/dev/isp/isp_sbus.c b/sys/dev/isp/isp_sbus.c
index 8914d9aba64c..b0dc0f056ec8 100644
--- a/sys/dev/isp/isp_sbus.c
+++ b/sys/dev/isp/isp_sbus.c
@@ -136,7 +136,7 @@ static int
isp_sbus_attach(device_t dev)
{
struct resource *regs;
- int tval, iqd, isp_debug, role, rid, ispburst, freq;
+ int tval, iqd, isp_debug, role, rid, ispburst;
struct isp_sbussoftc *sbs;
struct ispsoftc *isp = NULL;
int locksetup = 0;
@@ -203,16 +203,12 @@ isp_sbus_attach(device_t dev)
isp->isp_role = role;
isp->isp_dev = dev;
- freq = sbus_get_clockfreq(dev);
- if (freq) {
- /*
- * Convert from HZ to MHz, rounding up.
- */
- freq = (freq + 500000)/1000000;
- } else {
- freq = 25;
- }
- sbs->sbus_mdvec.dv_clock = freq << 8;
+ /*
+ * Get the clock frequency and convert it from HZ to MHz,
+ * rounding up. This defaults to 25MHz if there isn't a
+ * device specific one in the OFW device tree.
+ */
+ sbs->sbus_mdvec.dv_clock = (sbus_get_clockfreq(dev) + 500000)/1000000;
/*
* Now figure out what the proper burst sizes, etc., to use.