Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1812bc43 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'liquidio-standardization-and-cleanup' 



Rick Farrington says:

====================
liquidio: standardization and cleanup

This patchset corrects some non-standard macro usage.

1. Replaced custom MIN macro with use of standard 'min_t'.
2. Removed cryptic and misleading macro 'CAST_ULL'.

change log:
V1 -> V2:
  1. Add driver cleanup of macro 'CAST_ULL'.
V2 -> V3:
  1. Remove extra parentheses from previous usage of macro 'CAST_ULL'.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents fb5e7606 19d5c359

drivers/net/ethernet/cavium/liquidio/octeon_console.c

+2 −5
Original line number Diff line number Diff line
@@ -42,9 +42,6 @@ module_param(console_bitmask, int, 0644); 
MODULE_PARM_DESC(console_bitmask,

		 "Bitmask indicating which consoles have debug output redirected to syslog.");



#define MIN(a, b) min((a), (b))

#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
@@ -234,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;
@@ -704,7 +701,7 @@ static int octeon_console_read(struct octeon_device *oct, u32 console_num, 
	if (bytes_to_read <= 0)

		return bytes_to_read;



	bytes_to_read = MIN(bytes_to_read, (s32)buf_size);

	bytes_to_read = min_t(s32, bytes_to_read, buf_size);



	/* Check to see if what we want to read is not contiguous, and limit

	 * ourselves to the contiguous block