brcm80211: fmac: change function bus_rxctl parameter
brcmf_sdbrcm_bus_rxctl acts as an interface function of bus layer. Change parameter from struct brcmf_sdio to device pointer in order to provide a more compatible interface for different bus layers. This is part of the fullmac bus interface refactoring. Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com> Reviewed-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: Franky Lin <frankyl@broadcom.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>hifive-unleashed-5.1
parent
cad2b26b10
commit
532cdd3b99
|
@ -591,6 +591,7 @@ struct brcmf_pub {
|
||||||
struct brcmf_proto *prot;
|
struct brcmf_proto *prot;
|
||||||
struct brcmf_info *info;
|
struct brcmf_info *info;
|
||||||
struct brcmf_cfg80211_dev *config;
|
struct brcmf_cfg80211_dev *config;
|
||||||
|
struct device *dev; /* fullmac dongle device pointer */
|
||||||
|
|
||||||
/* Internal brcmf items */
|
/* Internal brcmf items */
|
||||||
bool up; /* Driver up/down (to OS) */
|
bool up; /* Driver up/down (to OS) */
|
||||||
|
|
|
@ -46,7 +46,7 @@ extern int
|
||||||
brcmf_sdbrcm_bus_txctl(struct brcmf_sdio *bus, unsigned char *msg, uint msglen);
|
brcmf_sdbrcm_bus_txctl(struct brcmf_sdio *bus, unsigned char *msg, uint msglen);
|
||||||
|
|
||||||
extern int
|
extern int
|
||||||
brcmf_sdbrcm_bus_rxctl(struct brcmf_sdio *bus, unsigned char *msg, uint msglen);
|
brcmf_sdbrcm_bus_rxctl(struct device *dev, unsigned char *msg, uint msglen);
|
||||||
|
|
||||||
extern void brcmf_sdbrcm_wd_timer(struct brcmf_sdio *bus, uint wdtick);
|
extern void brcmf_sdbrcm_wd_timer(struct brcmf_sdio *bus, uint wdtick);
|
||||||
|
|
||||||
|
|
|
@ -128,7 +128,7 @@ static int brcmf_proto_cdc_cmplt(struct brcmf_pub *drvr, u32 id, u32 len)
|
||||||
brcmf_dbg(TRACE, "Enter\n");
|
brcmf_dbg(TRACE, "Enter\n");
|
||||||
|
|
||||||
do {
|
do {
|
||||||
ret = brcmf_sdbrcm_bus_rxctl(drvr->bus,
|
ret = brcmf_sdbrcm_bus_rxctl(drvr->dev,
|
||||||
(unsigned char *)&prot->msg,
|
(unsigned char *)&prot->msg,
|
||||||
len + sizeof(struct brcmf_proto_cdc_dcmd));
|
len + sizeof(struct brcmf_proto_cdc_dcmd));
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
|
|
|
@ -963,6 +963,7 @@ struct brcmf_pub *brcmf_attach(struct brcmf_sdio *bus, uint bus_hdrlen,
|
||||||
drvr_priv->pub.bus = bus;
|
drvr_priv->pub.bus = bus;
|
||||||
drvr_priv->pub.hdrlen = bus_hdrlen;
|
drvr_priv->pub.hdrlen = bus_hdrlen;
|
||||||
drvr_priv->pub.bus_if = dev_get_drvdata(dev);
|
drvr_priv->pub.bus_if = dev_get_drvdata(dev);
|
||||||
|
drvr_priv->pub.dev = dev;
|
||||||
|
|
||||||
/* Attach and link in the protocol */
|
/* Attach and link in the protocol */
|
||||||
if (brcmf_proto_attach(&drvr_priv->pub) != 0) {
|
if (brcmf_proto_attach(&drvr_priv->pub) != 0) {
|
||||||
|
|
|
@ -2912,11 +2912,14 @@ brcmf_sdbrcm_bus_txctl(struct brcmf_sdio *bus, unsigned char *msg, uint msglen)
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
brcmf_sdbrcm_bus_rxctl(struct brcmf_sdio *bus, unsigned char *msg, uint msglen)
|
brcmf_sdbrcm_bus_rxctl(struct device *dev, unsigned char *msg, uint msglen)
|
||||||
{
|
{
|
||||||
int timeleft;
|
int timeleft;
|
||||||
uint rxlen = 0;
|
uint rxlen = 0;
|
||||||
bool pending;
|
bool pending;
|
||||||
|
struct brcmf_bus *bus_if = dev_get_drvdata(dev);
|
||||||
|
struct brcmf_sdio_dev *sdiodev = bus_if->bus_priv;
|
||||||
|
struct brcmf_sdio *bus = sdiodev->bus;
|
||||||
|
|
||||||
brcmf_dbg(TRACE, "Enter\n");
|
brcmf_dbg(TRACE, "Enter\n");
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue