o drivers/atm/horizon.c: test_bit & friends require long

parent b9719d5f
...@@ -603,8 +603,7 @@ static int make_rate (const hrz_dev * dev, u32 c, rounding r, ...@@ -603,8 +603,7 @@ static int make_rate (const hrz_dev * dev, u32 c, rounding r,
// note: rounding the rate down means rounding 'p' up // note: rounding the rate down means rounding 'p' up
const unsigned long br = test_bit (ultra, (hrz_flags *) &dev->flags) ? const unsigned long br = test_bit(ultra, &dev->flags) ? BR_ULT : BR_HRZ;
BR_ULT : BR_HRZ;
u32 div = CR_MIND; u32 div = CR_MIND;
u32 pre; u32 pre;
...@@ -1106,9 +1105,9 @@ static inline void rx_bus_master_complete_handler (hrz_dev * dev) { ...@@ -1106,9 +1105,9 @@ static inline void rx_bus_master_complete_handler (hrz_dev * dev) {
static inline int tx_hold (hrz_dev * dev) { static inline int tx_hold (hrz_dev * dev) {
while (test_and_set_bit (tx_busy, &dev->flags)) { while (test_and_set_bit (tx_busy, &dev->flags)) {
PRINTD (DBG_TX, "sleeping at tx lock %p %u", dev, dev->flags); PRINTD (DBG_TX, "sleeping at tx lock %p %lu", dev, dev->flags);
interruptible_sleep_on (&dev->tx_queue); interruptible_sleep_on (&dev->tx_queue);
PRINTD (DBG_TX, "woken at tx lock %p %u", dev, dev->flags); PRINTD (DBG_TX, "woken at tx lock %p %lu", dev, dev->flags);
if (signal_pending (current)) if (signal_pending (current))
return -1; return -1;
} }
......
...@@ -429,7 +429,7 @@ struct hrz_dev { ...@@ -429,7 +429,7 @@ struct hrz_dev {
#endif #endif
u8 irq; u8 irq;
u8 flags; long flags;
u8 tx_last; u8 tx_last;
u8 tx_idle; u8 tx_idle;
......
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