aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/cavium/liquidio/octeon_console.c
diff options
context:
space:
mode:
authorRick Farrington <ricardo.farrington@cavium.com>2017-07-26 12:11:09 -0700
committerDavid S. Miller <davem@davemloft.net>2017-07-27 17:29:34 -0700
commit19d5c35950ad222e7f0cb076b428f0888f3f15f4 (patch)
tree17230a58cf97bf52bf1fb2b4cf638dba11f9a040 /drivers/net/ethernet/cavium/liquidio/octeon_console.c
parentliquidio: standardization: use min_t instead of custom macro (diff)
downloadlinux-dev-19d5c35950ad222e7f0cb076b428f0888f3f15f4.tar.xz
linux-dev-19d5c35950ad222e7f0cb076b428f0888f3f15f4.zip
liquidio: cleanup: removed cryptic and misleading macro
Signed-off-by: Rick Farrington <ricardo.farrington@cavium.com> Signed-off-by: Felix Manlunas <felix.manlunas@cavium.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/cavium/liquidio/octeon_console.c')
-rw-r--r--drivers/net/ethernet/cavium/liquidio/octeon_console.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_console.c b/drivers/net/ethernet/cavium/liquidio/octeon_console.c
index 501ad95171fe..15ad1ab2c0c7 100644
--- a/drivers/net/ethernet/cavium/liquidio/octeon_console.c
+++ b/drivers/net/ethernet/cavium/liquidio/octeon_console.c
@@ -42,8 +42,6 @@ module_param(console_bitmask, int, 0644);
MODULE_PARM_DESC(console_bitmask,
"Bitmask indicating which consoles have debug output redirected to syslog.");
-#define CAST_ULL(v) ((u64)(v))
-
#define BOOTLOADER_PCI_READ_BUFFER_DATA_ADDR 0x0006c008
#define BOOTLOADER_PCI_READ_BUFFER_LEN_ADDR 0x0006c004
#define BOOTLOADER_PCI_READ_BUFFER_OWNER_ADDR 0x0006c000
@@ -233,7 +231,7 @@ static int __cvmx_bootmem_check_version(struct octeon_device *oct,
(exact_match && major_version != exact_match)) {
dev_err(&oct->pci_dev->dev, "bootmem ver mismatch %d.%d addr:0x%llx\n",
major_version, minor_version,
- CAST_ULL(oct->bootmem_desc_addr));
+ (long long)oct->bootmem_desc_addr);
return -1;
} else {
return 0;