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

Commit 54f7e503 authored by Teemu Paasikivi's avatar Teemu Paasikivi Committed by John W. Linville
Browse files

wl1271: Added functions to enable/disable interrupt handling 



Added/moved enable and disable interrupt handling functions.

Signed-off-by: default avatarTeemu Paasikivi <ext-teemu.3.paasikivi@nokia.com>
Reviewed-by: default avatarJuuso Oikarinen <juuso.oikarinen@nokia.com>
Signed-off-by: default avatarJuuso Oikarinen <juuso.oikarinen@nokia.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 2d5e82b8

drivers/net/wireless/wl12xx/wl1271_boot.c

+1 −1
Original line number Diff line number Diff line
@@ -299,7 +299,7 @@ static int wl1271_boot_upload_nvs(struct wl1271 *wl) 


static void wl1271_boot_enable_interrupts(struct wl1271 *wl)

{

	enable_irq(wl->irq);

	wl1271_enable_interrupts(wl);

	wl1271_write32(wl, ACX_REG_INTERRUPT_MASK,

		       WL1271_ACX_INTR_ALL & ~(WL1271_INTR_MASK));

	wl1271_write32(wl, HI_CFG, HI_CFG_DEF_VAL);

drivers/net/wireless/wl12xx/wl1271_io.c

+10 −0
Original line number Diff line number Diff line
@@ -31,6 +31,16 @@ 
#include "wl1271_spi.h"

#include "wl1271_io.h"



void wl1271_disable_interrupts(struct wl1271 *wl)

{

	wl1271_spi_disable_interrupts(wl);

}



void wl1271_enable_interrupts(struct wl1271 *wl)

{

	wl1271_spi_enable_interrupts(wl);

}



static int wl1271_translate_addr(struct wl1271 *wl, int addr)

{

	/*

drivers/net/wireless/wl12xx/wl1271_io.h

+3 −0
Original line number Diff line number Diff line
@@ -27,6 +27,9 @@ 


struct wl1271;



void wl1271_disable_interrupts(struct wl1271 *wl);

void wl1271_enable_interrupts(struct wl1271 *wl);



void wl1271_io_reset(struct wl1271 *wl);

void wl1271_io_init(struct wl1271 *wl);

drivers/net/wireless/wl12xx/wl1271_main.c

+0 −5
Original line number Diff line number Diff line
@@ -360,11 +360,6 @@ static int wl1271_plt_init(struct wl1271 *wl) 
	return ret;

}



static void wl1271_disable_interrupts(struct wl1271 *wl)

{

	disable_irq(wl->irq);

}



static void wl1271_power_off(struct wl1271 *wl)

{

	wl->set_power(false);

drivers/net/wireless/wl12xx/wl1271_spi.c

+10 −0
Original line number Diff line number Diff line
@@ -34,6 +34,16 @@ 
#include "wl1271_io.h"





void wl1271_spi_disable_interrupts(struct wl1271 *wl)

{

	disable_irq(wl->irq);

}



void wl1271_spi_enable_interrupts(struct wl1271 *wl)

{

	enable_irq(wl->irq);

}



void wl1271_spi_reset(struct wl1271 *wl)

{

	u8 *cmd;