diff options
| author | Aybuke Ozdemir | 2015-10-01 15:42:16 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2015-10-02 11:36:00 +0200 |
| commit | ec2c398eff3e928ad3932d6b041168bd85b45ff0 (patch) | |
| tree | fc714c8d81110df774c735b82957037130f524ca /drivers/staging/octeon/ethernet-tx.c | |
| parent | Staging: fbtft: Remove debug messages related to DEBUG_BACKLIGHT (diff) | |
| download | kernel-qcow2-linux-ec2c398eff3e928ad3932d6b041168bd85b45ff0.tar.gz kernel-qcow2-linux-ec2c398eff3e928ad3932d6b041168bd85b45ff0.tar.xz kernel-qcow2-linux-ec2c398eff3e928ad3932d6b041168bd85b45ff0.zip | |
Staging: octeon: Use preferred kernel type
This patch "uint*_t" type instead of "u*" type was used.
checkpatch.pl issue in octeon driver.
Signed-off-by: Aybuke Ozdemir <aybuke.147@gmail.com>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/octeon/ethernet-tx.c')
| -rw-r--r-- | drivers/staging/octeon/ethernet-tx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/octeon/ethernet-tx.c b/drivers/staging/octeon/ethernet-tx.c index 9e2116f4c915..3a5d8f53831c 100644 --- a/drivers/staging/octeon/ethernet-tx.c +++ b/drivers/staging/octeon/ethernet-tx.c @@ -143,8 +143,8 @@ int cvm_oct_xmit(struct sk_buff *skb, struct net_device *dev) { cvmx_pko_command_word0_t pko_command; union cvmx_buf_ptr hw_buffer; - uint64_t old_scratch; - uint64_t old_scratch2; + u64 old_scratch; + u64 old_scratch2; int qos; int i; enum {QUEUE_CORE, QUEUE_HW, QUEUE_DROP} queue_type; @@ -576,7 +576,7 @@ int cvm_oct_xmit_pow(struct sk_buff *skb, struct net_device *dev) * calculation may add a little extra, but that doesn't * hurt. */ - copy_location = packet_buffer + sizeof(uint64_t); + copy_location = packet_buffer + sizeof(u64); copy_location += ((CVMX_HELPER_FIRST_MBUFF_SKIP + 7) & 0xfff8) + 6; /* |