* [PATCH] ssb: make ssb_pcmcia_switch_core static
@ 2015-09-21 7:55 Rafał Miłecki
2015-09-21 16:11 ` Michael Büsch
2015-09-29 8:05 ` Kalle Valo
0 siblings, 2 replies; 3+ messages in thread
From: Rafał Miłecki @ 2015-09-21 7:55 UTC (permalink / raw)
To: Kalle Valo, linux-wireless, Michael Büsch
Cc: Hauke Mehrtens, Rafał Miłecki
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)
{
--
1.8.4.5
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] ssb: make ssb_pcmcia_switch_core static
2015-09-21 7:55 [PATCH] ssb: make ssb_pcmcia_switch_core static Rafał Miłecki
@ 2015-09-21 16:11 ` Michael Büsch
2015-09-29 8:05 ` Kalle Valo
1 sibling, 0 replies; 3+ messages in thread
From: Michael Büsch @ 2015-09-21 16:11 UTC (permalink / raw)
To: Rafał Miłecki; +Cc: Kalle Valo, linux-wireless, Hauke Mehrtens
[-- Attachment #1: Type: text/plain, Size: 1731 bytes --]
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>
--
Michael
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] ssb: make ssb_pcmcia_switch_core static
2015-09-21 7:55 [PATCH] ssb: make ssb_pcmcia_switch_core static Rafał Miłecki
2015-09-21 16:11 ` Michael Büsch
@ 2015-09-29 8:05 ` Kalle Valo
1 sibling, 0 replies; 3+ messages in thread
From: Kalle Valo @ 2015-09-29 8:05 UTC (permalink / raw)
To: Rafał Miłecki
Cc: linux-wireless, Michael Büsch, Hauke Mehrtens
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.
--
Kalle Valo
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-09-29 8:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-21 7:55 [PATCH] ssb: make ssb_pcmcia_switch_core static Rafał Miłecki
2015-09-21 16:11 ` Michael Büsch
2015-09-29 8:05 ` Kalle Valo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox