diff options
Diffstat (limited to 'drivers/usb/host/hc_crisv10.c')
-rw-r--r-- | drivers/usb/host/hc_crisv10.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/usb/host/hc_crisv10.c b/drivers/usb/host/hc_crisv10.c index 87eca6aeacf2..396dc69d4b4c 100644 --- a/drivers/usb/host/hc_crisv10.c +++ b/drivers/usb/host/hc_crisv10.c | |||
@@ -188,7 +188,7 @@ static DEFINE_TIMER(bulk_eot_timer, NULL, 0, 0); | |||
188 | #define CHECK_ALIGN(x) if (((__u32)(x)) & 0x00000003) \ | 188 | #define CHECK_ALIGN(x) if (((__u32)(x)) & 0x00000003) \ |
189 | {panic("Alignment check (DWORD) failed at %s:%s:%d\n", __FILE__, __FUNCTION__, __LINE__);} | 189 | {panic("Alignment check (DWORD) failed at %s:%s:%d\n", __FILE__, __FUNCTION__, __LINE__);} |
190 | 190 | ||
191 | #define SLAB_FLAG (in_interrupt() ? SLAB_ATOMIC : SLAB_KERNEL) | 191 | #define SLAB_FLAG (in_interrupt() ? GFP_ATOMIC : SLAB_KERNEL) |
192 | #define KMALLOC_FLAG (in_interrupt() ? GFP_ATOMIC : GFP_KERNEL) | 192 | #define KMALLOC_FLAG (in_interrupt() ? GFP_ATOMIC : GFP_KERNEL) |
193 | 193 | ||
194 | /* Most helpful debugging aid */ | 194 | /* Most helpful debugging aid */ |
@@ -1743,7 +1743,7 @@ static irqreturn_t etrax_usb_tx_interrupt(int irq, void *vhc) | |||
1743 | 1743 | ||
1744 | *R_DMA_CH8_SUB3_CLR_INTR = IO_STATE(R_DMA_CH8_SUB3_CLR_INTR, clr_descr, do); | 1744 | *R_DMA_CH8_SUB3_CLR_INTR = IO_STATE(R_DMA_CH8_SUB3_CLR_INTR, clr_descr, do); |
1745 | 1745 | ||
1746 | comp_data = (usb_isoc_complete_data_t*)kmem_cache_alloc(isoc_compl_cache, SLAB_ATOMIC); | 1746 | comp_data = (usb_isoc_complete_data_t*)kmem_cache_alloc(isoc_compl_cache, GFP_ATOMIC); |
1747 | assert(comp_data != NULL); | 1747 | assert(comp_data != NULL); |
1748 | 1748 | ||
1749 | INIT_WORK(&comp_data->usb_bh, etrax_usb_isoc_descr_interrupt_bottom_half, comp_data); | 1749 | INIT_WORK(&comp_data->usb_bh, etrax_usb_isoc_descr_interrupt_bottom_half, comp_data); |
@@ -3010,7 +3010,7 @@ static void etrax_usb_add_to_isoc_sb_list(struct urb *urb, int epid) | |||
3010 | if (!urb->iso_frame_desc[i].length) | 3010 | if (!urb->iso_frame_desc[i].length) |
3011 | continue; | 3011 | continue; |
3012 | 3012 | ||
3013 | next_sb_desc = (USB_SB_Desc_t*)kmem_cache_alloc(usb_desc_cache, SLAB_ATOMIC); | 3013 | next_sb_desc = (USB_SB_Desc_t*)kmem_cache_alloc(usb_desc_cache, GFP_ATOMIC); |
3014 | assert(next_sb_desc != NULL); | 3014 | assert(next_sb_desc != NULL); |
3015 | 3015 | ||
3016 | if (urb->iso_frame_desc[i].length > 0) { | 3016 | if (urb->iso_frame_desc[i].length > 0) { |
@@ -3063,7 +3063,7 @@ static void etrax_usb_add_to_isoc_sb_list(struct urb *urb, int epid) | |||
3063 | if (TxIsocEPList[epid].sub == 0) { | 3063 | if (TxIsocEPList[epid].sub == 0) { |
3064 | dbg_isoc("Isoc traffic not already running, allocating SB"); | 3064 | dbg_isoc("Isoc traffic not already running, allocating SB"); |
3065 | 3065 | ||
3066 | next_sb_desc = (USB_SB_Desc_t*)kmem_cache_alloc(usb_desc_cache, SLAB_ATOMIC); | 3066 | next_sb_desc = (USB_SB_Desc_t*)kmem_cache_alloc(usb_desc_cache, GFP_ATOMIC); |
3067 | assert(next_sb_desc != NULL); | 3067 | assert(next_sb_desc != NULL); |
3068 | 3068 | ||
3069 | next_sb_desc->command = (IO_STATE(USB_SB_command, tt, in) | | 3069 | next_sb_desc->command = (IO_STATE(USB_SB_command, tt, in) | |
@@ -3317,7 +3317,7 @@ static irqreturn_t etrax_usb_hc_interrupt_top_half(int irq, void *vhc) | |||
3317 | 3317 | ||
3318 | restore_flags(flags); | 3318 | restore_flags(flags); |
3319 | 3319 | ||
3320 | reg = (usb_interrupt_registers_t *)kmem_cache_alloc(top_half_reg_cache, SLAB_ATOMIC); | 3320 | reg = (usb_interrupt_registers_t *)kmem_cache_alloc(top_half_reg_cache, GFP_ATOMIC); |
3321 | 3321 | ||
3322 | assert(reg != NULL); | 3322 | assert(reg != NULL); |
3323 | 3323 | ||