diff options
| author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-12-12 21:57:50 -0800 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2009-01-04 23:50:34 +0100 |
| commit | c1fc58d63d754b82070881c62601551464afa19d (patch) | |
| tree | 3f4e1bc9a884aaea4fbfbb077e3865d2821d681d /drivers/ieee1394/csr.c | |
| parent | cbe7dd699e0bdda85a9279f2659b51b92e6782e3 (diff) | |
| download | linux-c1fc58d63d754b82070881c62601551464afa19d.tar.gz linux-c1fc58d63d754b82070881c62601551464afa19d.tar.bz2 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.c | 4 |
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) | |