Re: [PATCH] powerpc: Make some functions static
Mathieu Malaterre writes:
> On Tue, Mar 12, 2019 at 10:14 PM Christophe Leroy
> wrote:
>>
>>
>>
>> Le 12/03/2019 à 21:31, Mathieu Malaterre a écrit :
>> > In commit cb9e4d10c448 ("[POWERPC] Add support for 750CL Holly board")
>> > new functions were added. Since these functions can be made static,
>> > make it so. While doing so, it turns out that holly_power_off and
>> > holly_halt are unused, so remove them.
>>
>> I would have said 'since these functions are only used in this C file,
>> make them static'.
>>
>> I think this could be split in two patches:
>> 1/ Remove unused functions, ie holly_halt() and holly_power_off().
>> 2/ Make the other ones static.
>
> Michael do you want two patches ?
That would be better if it's not too much trouble. A patch with a title
of "Make some functions static" shouldn't really be deleting functions
entirely.
cheers
Re: [PATCH] powerpc: Make some functions static
On Tue, Mar 12, 2019 at 10:14 PM Christophe Leroy
wrote:
>
>
>
> Le 12/03/2019 à 21:31, Mathieu Malaterre a écrit :
> > In commit cb9e4d10c448 ("[POWERPC] Add support for 750CL Holly board")
> > new functions were added. Since these functions can be made static,
> > make it so. While doing so, it turns out that holly_power_off and
> > holly_halt are unused, so remove them.
>
> I would have said 'since these functions are only used in this C file,
> make them static'.
>
> I think this could be split in two patches:
> 1/ Remove unused functions, ie holly_halt() and holly_power_off().
> 2/ Make the other ones static.
Michael do you want two patches ?
> Christophe
>
> >
> > Silence the following warnings triggered using W=1:
> >
> >arch/powerpc/platforms/embedded6xx/holly.c:47:5: error: no previous
> > prototype for 'holly_exclude_device' [-Werror=missing-prototypes]
> >arch/powerpc/platforms/embedded6xx/holly.c:190:6: error: no previous
> > prototype for 'holly_show_cpuinfo' [-Werror=missing-prototypes]
> >arch/powerpc/platforms/embedded6xx/holly.c:196:17: error: no previous
> > prototype for 'holly_restart' [-Werror=missing-prototypes]
> >arch/powerpc/platforms/embedded6xx/holly.c:236:6: error: no previous
> > prototype for 'holly_power_off' [-Werror=missing-prototypes]
> >arch/powerpc/platforms/embedded6xx/holly.c:243:6: error: no previous
> > prototype for 'holly_halt' [-Werror=missing-prototypes]
> >
> > Signed-off-by: Mathieu Malaterre
> > ---
> > arch/powerpc/platforms/embedded6xx/holly.c | 19 ---
> > 1 file changed, 4 insertions(+), 15 deletions(-)
> >
> > diff --git a/arch/powerpc/platforms/embedded6xx/holly.c
> > b/arch/powerpc/platforms/embedded6xx/holly.c
> > index 0409714e8070..829bf3697dc9 100644
> > --- a/arch/powerpc/platforms/embedded6xx/holly.c
> > +++ b/arch/powerpc/platforms/embedded6xx/holly.c
> > @@ -44,7 +44,8 @@
> >
> > #define HOLLY_PCI_CFG_PHYS 0x7c00
> >
> > -int holly_exclude_device(struct pci_controller *hose, u_char bus, u_char
> > devfn)
> > +static int holly_exclude_device(struct pci_controller *hose, u_char bus,
> > + u_char devfn)
> > {
> > if (bus == 0 && PCI_SLOT(devfn) == 0)
> > return PCIBIOS_DEVICE_NOT_FOUND;
> > @@ -187,13 +188,13 @@ static void __init holly_init_IRQ(void)
> > tsi108_write_reg(TSI108_MPIC_OFFSET + 0x30c, 0);
> > }
> >
> > -void holly_show_cpuinfo(struct seq_file *m)
> > +static void holly_show_cpuinfo(struct seq_file *m)
> > {
> > seq_printf(m, "vendor\t\t: IBM\n");
> > seq_printf(m, "machine\t\t: PPC750 GX/CL\n");
> > }
> >
> > -void __noreturn holly_restart(char *cmd)
> > +static void __noreturn holly_restart(char *cmd)
> > {
> > __be32 __iomem *ocn_bar1 = NULL;
> > unsigned long bar;
> > @@ -233,18 +234,6 @@ void __noreturn holly_restart(char *cmd)
> > for (;;) ;
> > }
> >
> > -void holly_power_off(void)
> > -{
> > - local_irq_disable();
> > - /* No way to shut power off with software */
> > - for (;;) ;
> > -}
> > -
> > -void holly_halt(void)
> > -{
> > - holly_power_off();
> > -}
> > -
> > /*
> >* Called very early, device-tree isn't unflattened
> >*/
> >
Re: [PATCH] powerpc: Make some functions static
Le 12/03/2019 à 21:31, Mathieu Malaterre a écrit :
In commit cb9e4d10c448 ("[POWERPC] Add support for 750CL Holly board")
new functions were added. Since these functions can be made static,
make it so. While doing so, it turns out that holly_power_off and
holly_halt are unused, so remove them.
I would have said 'since these functions are only used in this C file,
make them static'.
I think this could be split in two patches:
1/ Remove unused functions, ie holly_halt() and holly_power_off().
2/ Make the other ones static.
Christophe
Silence the following warnings triggered using W=1:
arch/powerpc/platforms/embedded6xx/holly.c:47:5: error: no previous
prototype for 'holly_exclude_device' [-Werror=missing-prototypes]
arch/powerpc/platforms/embedded6xx/holly.c:190:6: error: no previous
prototype for 'holly_show_cpuinfo' [-Werror=missing-prototypes]
arch/powerpc/platforms/embedded6xx/holly.c:196:17: error: no previous
prototype for 'holly_restart' [-Werror=missing-prototypes]
arch/powerpc/platforms/embedded6xx/holly.c:236:6: error: no previous
prototype for 'holly_power_off' [-Werror=missing-prototypes]
arch/powerpc/platforms/embedded6xx/holly.c:243:6: error: no previous
prototype for 'holly_halt' [-Werror=missing-prototypes]
Signed-off-by: Mathieu Malaterre
---
arch/powerpc/platforms/embedded6xx/holly.c | 19 ---
1 file changed, 4 insertions(+), 15 deletions(-)
diff --git a/arch/powerpc/platforms/embedded6xx/holly.c
b/arch/powerpc/platforms/embedded6xx/holly.c
index 0409714e8070..829bf3697dc9 100644
--- a/arch/powerpc/platforms/embedded6xx/holly.c
+++ b/arch/powerpc/platforms/embedded6xx/holly.c
@@ -44,7 +44,8 @@
#define HOLLY_PCI_CFG_PHYS 0x7c00
-int holly_exclude_device(struct pci_controller *hose, u_char bus, u_char devfn)
+static int holly_exclude_device(struct pci_controller *hose, u_char bus,
+ u_char devfn)
{
if (bus == 0 && PCI_SLOT(devfn) == 0)
return PCIBIOS_DEVICE_NOT_FOUND;
@@ -187,13 +188,13 @@ static void __init holly_init_IRQ(void)
tsi108_write_reg(TSI108_MPIC_OFFSET + 0x30c, 0);
}
-void holly_show_cpuinfo(struct seq_file *m)
+static void holly_show_cpuinfo(struct seq_file *m)
{
seq_printf(m, "vendor\t\t: IBM\n");
seq_printf(m, "machine\t\t: PPC750 GX/CL\n");
}
-void __noreturn holly_restart(char *cmd)
+static void __noreturn holly_restart(char *cmd)
{
__be32 __iomem *ocn_bar1 = NULL;
unsigned long bar;
@@ -233,18 +234,6 @@ void __noreturn holly_restart(char *cmd)
for (;;) ;
}
-void holly_power_off(void)
-{
- local_irq_disable();
- /* No way to shut power off with software */
- for (;;) ;
-}
-
-void holly_halt(void)
-{
- holly_power_off();
-}
-
/*
* Called very early, device-tree isn't unflattened
*/
[PATCH] powerpc: Make some functions static
In commit cb9e4d10c448 ("[POWERPC] Add support for 750CL Holly board")
new functions were added. Since these functions can be made static,
make it so. While doing so, it turns out that holly_power_off and
holly_halt are unused, so remove them.
Silence the following warnings triggered using W=1:
arch/powerpc/platforms/embedded6xx/holly.c:47:5: error: no previous prototype
for 'holly_exclude_device' [-Werror=missing-prototypes]
arch/powerpc/platforms/embedded6xx/holly.c:190:6: error: no previous
prototype for 'holly_show_cpuinfo' [-Werror=missing-prototypes]
arch/powerpc/platforms/embedded6xx/holly.c:196:17: error: no previous
prototype for 'holly_restart' [-Werror=missing-prototypes]
arch/powerpc/platforms/embedded6xx/holly.c:236:6: error: no previous
prototype for 'holly_power_off' [-Werror=missing-prototypes]
arch/powerpc/platforms/embedded6xx/holly.c:243:6: error: no previous
prototype for 'holly_halt' [-Werror=missing-prototypes]
Signed-off-by: Mathieu Malaterre
---
arch/powerpc/platforms/embedded6xx/holly.c | 19 ---
1 file changed, 4 insertions(+), 15 deletions(-)
diff --git a/arch/powerpc/platforms/embedded6xx/holly.c
b/arch/powerpc/platforms/embedded6xx/holly.c
index 0409714e8070..829bf3697dc9 100644
--- a/arch/powerpc/platforms/embedded6xx/holly.c
+++ b/arch/powerpc/platforms/embedded6xx/holly.c
@@ -44,7 +44,8 @@
#define HOLLY_PCI_CFG_PHYS 0x7c00
-int holly_exclude_device(struct pci_controller *hose, u_char bus, u_char devfn)
+static int holly_exclude_device(struct pci_controller *hose, u_char bus,
+ u_char devfn)
{
if (bus == 0 && PCI_SLOT(devfn) == 0)
return PCIBIOS_DEVICE_NOT_FOUND;
@@ -187,13 +188,13 @@ static void __init holly_init_IRQ(void)
tsi108_write_reg(TSI108_MPIC_OFFSET + 0x30c, 0);
}
-void holly_show_cpuinfo(struct seq_file *m)
+static void holly_show_cpuinfo(struct seq_file *m)
{
seq_printf(m, "vendor\t\t: IBM\n");
seq_printf(m, "machine\t\t: PPC750 GX/CL\n");
}
-void __noreturn holly_restart(char *cmd)
+static void __noreturn holly_restart(char *cmd)
{
__be32 __iomem *ocn_bar1 = NULL;
unsigned long bar;
@@ -233,18 +234,6 @@ void __noreturn holly_restart(char *cmd)
for (;;) ;
}
-void holly_power_off(void)
-{
- local_irq_disable();
- /* No way to shut power off with software */
- for (;;) ;
-}
-
-void holly_halt(void)
-{
- holly_power_off();
-}
-
/*
* Called very early, device-tree isn't unflattened
*/
--
2.20.1
