Commit bfc9473b authored by Yanir Lubetkin's avatar Yanir Lubetkin Committed by Jeff Kirsher

e1000e: remove call to do_div and sign mismatch warning

Fixes a warning that was reported by Yanjiang Jin
<yanjiang.jin@windriver.com> by implementing the solution suggested by
Alexander Duyck <alexander.h.duyck@redhat.com>.
Signed-off-by: default avatarYanir Lubetkin <yanirx.lubetkin@intel.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 0ffc5646
...@@ -1014,7 +1014,6 @@ static s32 e1000_platform_pm_pch_lpt(struct e1000_hw *hw, bool link) ...@@ -1014,7 +1014,6 @@ static s32 e1000_platform_pm_pch_lpt(struct e1000_hw *hw, bool link)
u16 speed, duplex, scale = 0; u16 speed, duplex, scale = 0;
u16 max_snoop, max_nosnoop; u16 max_snoop, max_nosnoop;
u16 max_ltr_enc; /* max LTR latency encoded */ u16 max_ltr_enc; /* max LTR latency encoded */
s64 lat_ns; /* latency (ns) */
u64 value; u64 value;
u32 rxa; u32 rxa;
...@@ -1040,14 +1039,10 @@ static s32 e1000_platform_pm_pch_lpt(struct e1000_hw *hw, bool link) ...@@ -1040,14 +1039,10 @@ static s32 e1000_platform_pm_pch_lpt(struct e1000_hw *hw, bool link)
* 2^25*(2^10-1) ns. The scale is encoded as 0=2^0ns, * 2^25*(2^10-1) ns. The scale is encoded as 0=2^0ns,
* 1=2^5ns, 2=2^10ns,...5=2^25ns. * 1=2^5ns, 2=2^10ns,...5=2^25ns.
*/ */
lat_ns = ((s64)rxa * 1024 - rxa *= 512;
(2 * (s64)hw->adapter->max_frame_size)) * 8 * 1000; value = (rxa > hw->adapter->max_frame_size) ?
if (lat_ns < 0) { (rxa - hw->adapter->max_frame_size) * (16000 / speed) :
value = 0; 0;
} else {
value = lat_ns;
do_div(value, speed);
}
while (value > PCI_LTR_VALUE_MASK) { while (value > PCI_LTR_VALUE_MASK) {
scale++; scale++;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment