summaryrefslogtreecommitdiffstats
path: root/drivers/ieee1394/csr.c
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-12-13 06:57:50 +0100
committerStefan Richter <stefanr@s5r6.in-berlin.de>2009-01-04 23:50:34 +0100
commitc1fc58d63d754b82070881c62601551464afa19d (patch)
tree3f4e1bc9a884aaea4fbfbb077e3865d2821d681d /drivers/ieee1394/csr.c
parentieee1394: ohci1394: flush MMIO writes before delay in initialization (diff)
downloadlinux-c1fc58d63d754b82070881c62601551464afa19d.tar.xz
linux-c1fc58d63d754b82070881c62601551464afa19d.zip
ieee1394: consolidate uses of IEEE1934_BUSID_MAGIC
Move the definition out of nodemgr.h and use it in csr.c/pcilynx.c Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers/ieee1394/csr.c')
-rw-r--r--drivers/ieee1394/csr.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ieee1394/csr.c b/drivers/ieee1394/csr.c
index 9029b6839f0b..31400c8ae051 100644
--- a/drivers/ieee1394/csr.c
+++ b/drivers/ieee1394/csr.c
@@ -217,7 +217,7 @@ static void add_host(struct hpsb_host *host)
host->csr.generation = 2;
- bus_info[1] = __constant_cpu_to_be32(0x31333934);
+ bus_info[1] = IEEE1394_BUSID_MAGIC;
bus_info[2] = cpu_to_be32((hpsb_disable_irm ? 0 : 1 << CSR_IRMC_SHIFT) |
(1 << CSR_CMC_SHIFT) |
(1 << CSR_ISC_SHIFT) |
@@ -250,7 +250,7 @@ static void remove_host(struct hpsb_host *host)
{
quadlet_t bus_info[CSR_BUS_INFO_SIZE];
- bus_info[1] = __constant_cpu_to_be32(0x31333934);
+ bus_info[1] = IEEE1394_BUSID_MAGIC;
bus_info[2] = cpu_to_be32((0 << CSR_IRMC_SHIFT) |
(0 << CSR_CMC_SHIFT) |
(0 << CSR_ISC_SHIFT) |