diff options
author | Chas Williams <chas@cmf.nrl.navy.mil> | 2008-07-23 23:29:21 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-07-23 23:29:21 -0400 |
commit | 6f75a9b6426e686649ac440c37ec7c249501f9a5 (patch) | |
tree | 1da4ce9774ea14b374db25073c00850d9345600b /drivers/atm/fore200e.c | |
parent | 70eed75d76635ba7350651b9bd96529a306ec67a (diff) |
atm: [fore200e] use MODULE_FIRMWARE() and other suggested cleanups
Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/atm/fore200e.c')
-rw-r--r-- | drivers/atm/fore200e.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c index d5c1bbfbe79d..73338d231db9 100644 --- a/drivers/atm/fore200e.c +++ b/drivers/atm/fore200e.c | |||
@@ -2562,7 +2562,8 @@ fore200e_load_and_start_fw(struct fore200e* fore200e) | |||
2562 | const struct firmware *firmware; | 2562 | const struct firmware *firmware; |
2563 | struct device *device; | 2563 | struct device *device; |
2564 | struct fw_header *fw_header; | 2564 | struct fw_header *fw_header; |
2565 | u32 *fw_data, fw_size; | 2565 | const __le32 *fw_data; |
2566 | u32 fw_size; | ||
2566 | u32 __iomem *load_addr; | 2567 | u32 __iomem *load_addr; |
2567 | char buf[48]; | 2568 | char buf[48]; |
2568 | int err = -ENODEV; | 2569 | int err = -ENODEV; |
@@ -2582,7 +2583,7 @@ fore200e_load_and_start_fw(struct fore200e* fore200e) | |||
2582 | return err; | 2583 | return err; |
2583 | } | 2584 | } |
2584 | 2585 | ||
2585 | fw_data = (u32 *) firmware->data; | 2586 | fw_data = (__le32 *) firmware->data; |
2586 | fw_size = firmware->size / sizeof(u32); | 2587 | fw_size = firmware->size / sizeof(u32); |
2587 | fw_header = (struct fw_header *) firmware->data; | 2588 | fw_header = (struct fw_header *) firmware->data; |
2588 | load_addr = fore200e->virt_base + le32_to_cpu(fw_header->load_offset); | 2589 | load_addr = fore200e->virt_base + le32_to_cpu(fw_header->load_offset); |
@@ -3199,6 +3200,14 @@ static const struct fore200e_bus fore200e_bus[] = { | |||
3199 | {} | 3200 | {} |
3200 | }; | 3201 | }; |
3201 | 3202 | ||
3202 | #ifdef MODULE_LICENSE | ||
3203 | MODULE_LICENSE("GPL"); | 3203 | MODULE_LICENSE("GPL"); |
3204 | #ifdef CONFIG_PCI | ||
3205 | #ifdef __LITTLE_ENDIAN__ | ||
3206 | MODULE_FIRMWARE("pca200e.bin"); | ||
3207 | #else | ||
3208 | MODULE_FIRMWARE("pca200e_ecd.bin2"); | ||
3209 | #endif | ||
3210 | #endif /* CONFIG_PCI */ | ||
3211 | #ifdef CONFIG_SBUS | ||
3212 | MODULE_FIRMWARE("sba200e_ecd.bin2"); | ||
3204 | #endif | 3213 | #endif |