| Message ID | 1442822126-23372-1-git-send-email-zajec5@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Kalle Valo |
| Headers | show |
On Mon, 21 Sep 2015 09:55:26 +0200 Rafa? Mi?ecki <zajec5@gmail.com> wrote: > Signed-off-by: Rafa? Mi?ecki <zajec5@gmail.com> > --- > drivers/ssb/pcmcia.c | 3 +-- > drivers/ssb/ssb_private.h | 7 ------- > 2 files changed, 1 insertion(+), 9 deletions(-) > > diff --git a/drivers/ssb/pcmcia.c b/drivers/ssb/pcmcia.c > index b413e01..f03422b 100644 > --- a/drivers/ssb/pcmcia.c > +++ b/drivers/ssb/pcmcia.c > @@ -147,8 +147,7 @@ error: > return err; > } > > -int ssb_pcmcia_switch_core(struct ssb_bus *bus, > - struct ssb_device *dev) > +static int ssb_pcmcia_switch_core(struct ssb_bus *bus, struct ssb_device *dev) > { > int err; > > diff --git a/drivers/ssb/ssb_private.h b/drivers/ssb/ssb_private.h > index 426c805..8a2ebc8 100644 > --- a/drivers/ssb/ssb_private.h > +++ b/drivers/ssb/ssb_private.h > @@ -85,8 +85,6 @@ static inline int ssb_pci_init(struct ssb_bus *bus) > > /* pcmcia.c */ > #ifdef CONFIG_SSB_PCMCIAHOST > -extern int ssb_pcmcia_switch_core(struct ssb_bus *bus, > - struct ssb_device *dev); > extern int ssb_pcmcia_switch_coreidx(struct ssb_bus *bus, > u8 coreidx); > extern int ssb_pcmcia_switch_segment(struct ssb_bus *bus, > @@ -98,11 +96,6 @@ extern void ssb_pcmcia_exit(struct ssb_bus *bus); > extern int ssb_pcmcia_init(struct ssb_bus *bus); > extern const struct ssb_bus_ops ssb_pcmcia_ops; > #else /* CONFIG_SSB_PCMCIAHOST */ > -static inline int ssb_pcmcia_switch_core(struct ssb_bus *bus, > - struct ssb_device *dev) > -{ > - return 0; > -} > static inline int ssb_pcmcia_switch_coreidx(struct ssb_bus *bus, > u8 coreidx) > { Acked-by: Michael Buesch <m@bues.ch>
Rafa? Mi?ecki <zajec5@gmail.com> writes:
> Signed-off-by: Rafa? Mi?ecki <zajec5@gmail.com>
Thanks, manually applied.
And please, no empty commit logs in the future.
diff --git a/drivers/ssb/pcmcia.c b/drivers/ssb/pcmcia.c index b413e01..f03422b 100644 --- a/drivers/ssb/pcmcia.c +++ b/drivers/ssb/pcmcia.c @@ -147,8 +147,7 @@ error: return err; } -int ssb_pcmcia_switch_core(struct ssb_bus *bus, - struct ssb_device *dev) +static int ssb_pcmcia_switch_core(struct ssb_bus *bus, struct ssb_device *dev) { int err; diff --git a/drivers/ssb/ssb_private.h b/drivers/ssb/ssb_private.h index 426c805..8a2ebc8 100644 --- a/drivers/ssb/ssb_private.h +++ b/drivers/ssb/ssb_private.h @@ -85,8 +85,6 @@ static inline int ssb_pci_init(struct ssb_bus *bus) /* pcmcia.c */ #ifdef CONFIG_SSB_PCMCIAHOST -extern int ssb_pcmcia_switch_core(struct ssb_bus *bus, - struct ssb_device *dev); extern int ssb_pcmcia_switch_coreidx(struct ssb_bus *bus, u8 coreidx); extern int ssb_pcmcia_switch_segment(struct ssb_bus *bus, @@ -98,11 +96,6 @@ extern void ssb_pcmcia_exit(struct ssb_bus *bus); extern int ssb_pcmcia_init(struct ssb_bus *bus); extern const struct ssb_bus_ops ssb_pcmcia_ops; #else /* CONFIG_SSB_PCMCIAHOST */ -static inline int ssb_pcmcia_switch_core(struct ssb_bus *bus, - struct ssb_device *dev) -{ - return 0; -} static inline int ssb_pcmcia_switch_coreidx(struct ssb_bus *bus, u8 coreidx) {
Signed-off-by: Rafa? Mi?ecki <zajec5@gmail.com> --- drivers/ssb/pcmcia.c | 3 +-- drivers/ssb/ssb_private.h | 7 ------- 2 files changed, 1 insertion(+), 9 deletions(-)