[trivial] use named structure member initializers for pci_ops structures
13 messages,
2 authors,
2007-08-09 · open the first message on its own page
This series converts all pci_ops structures in arch/powerpc to named
member initializers, in accordance with prevailing practice in the
kernel. No behavioral or otherwise stylistic changes.
arch/powerpc/kernel/pci_32.c | 4 ++--
arch/powerpc/kernel/rtas_pci.c | 4 ++--
arch/powerpc/platforms/52xx/efika.c | 4 ++--
arch/powerpc/platforms/celleb/pci.c | 4 ++--
arch/powerpc/platforms/celleb/scc_epci.c | 4 ++--
arch/powerpc/platforms/chrp/pci.c | 8 ++++----
arch/powerpc/platforms/maple/pci.c | 12 ++++++------
arch/powerpc/platforms/pasemi/pci.c | 4 ++--
arch/powerpc/platforms/powermac/pci.c | 16 ++++++++--------
arch/powerpc/sysdev/indirect_pci.c | 4 ++--
arch/powerpc/sysdev/tsi108_pci.c | 4 ++--
11 files changed, 34 insertions(+), 34 deletions(-)
Signed-off-by: Nathan Lynch <redacted>
---
arch/powerpc/kernel/rtas_pci.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/kernel/rtas_pci.c b/arch/powerpc/kernel/rtas_pci.c
index a5de621..21f14e5 100644
--- a/arch/powerpc/kernel/rtas_pci.c
+++ b/arch/powerpc/kernel/rtas_pci.c @@ -171,8 +171,8 @@ static int rtas_pci_write_config(struct pci_bus *bus,
}
struct pci_ops rtas_pci_ops = {
- rtas_pci_read_config ,
- rtas_pci_write_config
+ . read = rtas_pci_read_config ,
+ . write = rtas_pci_write_config ,
};
int is_python ( struct device_node * dev ) --
1.5.2.4
Signed-off-by: Nathan Lynch <redacted>
---
arch/powerpc/platforms/celleb/pci.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/platforms/celleb/pci.c b/arch/powerpc/platforms/celleb/pci.c
index e9ac19c..de8038b 100644
--- a/arch/powerpc/platforms/celleb/pci.c
+++ b/arch/powerpc/platforms/celleb/pci.c @@ -242,8 +242,8 @@ static int celleb_fake_pci_write_config(struct pci_bus *bus,
}
static struct pci_ops celleb_fake_pci_ops = {
- celleb_fake_pci_read_config ,
- celleb_fake_pci_write_config
+ . read = celleb_fake_pci_read_config ,
+ . write = celleb_fake_pci_write_config ,
};
static inline void celleb_setup_pci_base_addrs ( struct pci_controller * hose , --
1.5.2.4
Signed-off-by: Nathan Lynch <redacted>
---
arch/powerpc/platforms/celleb/scc_epci.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/platforms/celleb/scc_epci.c b/arch/powerpc/platforms/celleb/scc_epci.c
index c4b0110..7506acc 100644
--- a/arch/powerpc/platforms/celleb/scc_epci.c
+++ b/arch/powerpc/platforms/celleb/scc_epci.c @@ -278,8 +278,8 @@ static int celleb_epci_write_config(struct pci_bus *bus,
}
struct pci_ops celleb_epci_ops = {
- celleb_epci_read_config ,
- celleb_epci_write_config ,
+ . read = celleb_epci_read_config ,
+ . write = celleb_epci_write_config ,
};
/* to be moved in FW */ --
1.5.2.4
Signed-off-by: Nathan Lynch <redacted>
---
arch/powerpc/platforms/maple/pci.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/powerpc/platforms/maple/pci.c b/arch/powerpc/platforms/maple/pci.c
index 2542403..6247f94 100644
--- a/arch/powerpc/platforms/maple/pci.c
+++ b/arch/powerpc/platforms/maple/pci.c @@ -185,8 +185,8 @@ static int u3_agp_write_config(struct pci_bus *bus, unsigned int devfn,
static struct pci_ops u3_agp_pci_ops =
{
- u3_agp_read_config ,
- u3_agp_write_config
+ . read = u3_agp_read_config ,
+ . write = u3_agp_write_config ,
};
static unsigned long u3_ht_cfa0 ( u8 devfn , u8 off ) @@ -284,8 +284,8 @@ static int u3_ht_write_config(struct pci_bus *bus, unsigned int devfn,
static struct pci_ops u3_ht_pci_ops =
{
- u3_ht_read_config ,
- u3_ht_write_config
+ . read = u3_ht_read_config ,
+ . write = u3_ht_write_config ,
};
static unsigned int u4_pcie_cfa0 ( unsigned int devfn , unsigned int off ) @@ -392,8 +392,8 @@ static int u4_pcie_write_config(struct pci_bus *bus, unsigned int devfn,
static struct pci_ops u4_pcie_pci_ops =
{
- u4_pcie_read_config ,
- u4_pcie_write_config
+ . read = u4_pcie_read_config ,
+ . write = u4_pcie_write_config ,
};
static void __init setup_u3_agp ( struct pci_controller * hose ) --
1.5.2.4
Signed-off-by: Nathan Lynch <redacted>
---
arch/powerpc/platforms/pasemi/pci.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/platforms/pasemi/pci.c b/arch/powerpc/platforms/pasemi/pci.c
index ab1f5f6..882b571 100644
--- a/arch/powerpc/platforms/pasemi/pci.c
+++ b/arch/powerpc/platforms/pasemi/pci.c @@ -122,8 +122,8 @@ static int pa_pxp_write_config(struct pci_bus *bus, unsigned int devfn,
}
static struct pci_ops pa_pxp_ops = {
- pa_pxp_read_config ,
- pa_pxp_write_config ,
+ . read = pa_pxp_read_config ,
+ . write = pa_pxp_write_config ,
};
static void __init setup_pa_pxp ( struct pci_controller * hose ) --
1.5.2.4
Signed-off-by: Nathan Lynch <redacted>
---
arch/powerpc/platforms/powermac/pci.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/arch/powerpc/platforms/powermac/pci.c b/arch/powerpc/platforms/powermac/pci.c
index 92586db..69d67ff 100644
--- a/arch/powerpc/platforms/powermac/pci.c
+++ b/arch/powerpc/platforms/powermac/pci.c @@ -225,8 +225,8 @@ static int macrisc_write_config(struct pci_bus *bus, unsigned int devfn,
static struct pci_ops macrisc_pci_ops =
{
- macrisc_read_config ,
- macrisc_write_config
+ . read = macrisc_read_config ,
+ . write = macrisc_write_config ,
};
#ifdef CONFIG_PPC32 @@ -280,8 +280,8 @@ chaos_write_config(struct pci_bus *bus, unsigned int devfn, int offset,
static struct pci_ops chaos_pci_ops =
{
- chaos_read_config ,
- chaos_write_config
+ . read = chaos_read_config ,
+ . write = chaos_write_config ,
};
static void __init setup_chaos ( struct pci_controller * hose , @@ -456,8 +456,8 @@ static int u3_ht_write_config(struct pci_bus *bus, unsigned int devfn,
static struct pci_ops u3_ht_pci_ops =
{
- u3_ht_read_config ,
- u3_ht_write_config
+ . read = u3_ht_read_config ,
+ . write = u3_ht_write_config ,
};
#define U4_PCIE_CFA0(devfn, off) \ @@ -561,8 +561,8 @@ static int u4_pcie_write_config(struct pci_bus *bus, unsigned int devfn,
static struct pci_ops u4_pcie_pci_ops =
{
- u4_pcie_read_config ,
- u4_pcie_write_config
+ . read = u4_pcie_read_config ,
+ . write = u4_pcie_write_config ,
};
#endif /* CONFIG_PPC64 */ --
1.5.2.4
Signed-off-by: Nathan Lynch <redacted>
---
arch/powerpc/kernel/pci_32.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/kernel/pci_32.c b/arch/powerpc/kernel/pci_32.c
index 04a3109..0e2bee4 100644
--- a/arch/powerpc/kernel/pci_32.c
+++ b/arch/powerpc/kernel/pci_32.c @@ -1457,8 +1457,8 @@ null_write_config(struct pci_bus *bus, unsigned int devfn, int offset,
static struct pci_ops null_pci_ops =
{
- null_read_config ,
- null_write_config
+ . read = null_read_config ,
+ . write = null_write_config ,
};
/* --
1.5.2.4
Signed-off-by: Nathan Lynch <redacted>
---
arch/powerpc/platforms/52xx/efika.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/platforms/52xx/efika.c b/arch/powerpc/platforms/52xx/efika.c
index 4be6e7a..4263158 100644
--- a/arch/powerpc/platforms/52xx/efika.c
+++ b/arch/powerpc/platforms/52xx/efika.c @@ -78,8 +78,8 @@ static int rtas_write_config(struct pci_bus *bus, unsigned int devfn,
}
static struct pci_ops rtas_pci_ops = {
- rtas_read_config ,
- rtas_write_config
+ . read = rtas_read_config ,
+ . write = rtas_write_config ,
};
--
1.5.2.4
Signed-off-by: Nathan Lynch <redacted>
---
arch/powerpc/platforms/chrp/pci.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/powerpc/platforms/chrp/pci.c b/arch/powerpc/platforms/chrp/pci.c
index 28d1647..0c6dba9 100644
--- a/arch/powerpc/platforms/chrp/pci.c
+++ b/arch/powerpc/platforms/chrp/pci.c @@ -86,8 +86,8 @@ int gg2_write_config(struct pci_bus *bus, unsigned int devfn, int off,
static struct pci_ops gg2_pci_ops =
{
- gg2_read_config ,
- gg2_write_config
+ . read = gg2_read_config ,
+ . write = gg2_write_config ,
};
/* @@ -124,8 +124,8 @@ int rtas_write_config(struct pci_bus *bus, unsigned int devfn, int offset,
static struct pci_ops rtas_pci_ops =
{
- rtas_read_config ,
- rtas_write_config
+ . read = rtas_read_config ,
+ . write = rtas_write_config ,
};
volatile struct Hydra __iomem * Hydra = NULL ; --
1.5.2.4
Signed-off-by: Nathan Lynch <redacted>
---
arch/powerpc/sysdev/indirect_pci.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/sysdev/indirect_pci.c b/arch/powerpc/sysdev/indirect_pci.c
index 5294560..b5d0682 100644
--- a/arch/powerpc/sysdev/indirect_pci.c
+++ b/arch/powerpc/sysdev/indirect_pci.c @@ -144,8 +144,8 @@ indirect_write_config(struct pci_bus *bus, unsigned int devfn, int offset,
static struct pci_ops indirect_pci_ops =
{
- indirect_read_config ,
- indirect_write_config
+ . read = indirect_read_config ,
+ . write = indirect_write_config ,
};
void __init --
1.5.2.4
Signed-off-by: Nathan Lynch <redacted>
---
arch/powerpc/sysdev/tsi108_pci.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/sysdev/tsi108_pci.c b/arch/powerpc/sysdev/tsi108_pci.c
index 90db8a7..cf0bfbd 100644
--- a/arch/powerpc/sysdev/tsi108_pci.c
+++ b/arch/powerpc/sysdev/tsi108_pci.c @@ -193,8 +193,8 @@ void tsi108_clear_pci_cfg_error(void)
}
static struct pci_ops tsi108_direct_pci_ops = {
- tsi108_direct_read_config ,
- tsi108_direct_write_config
+ . read = tsi108_direct_read_config ,
+ . write = tsi108_direct_write_config ,
};
int __init tsi108_setup_pci ( struct device_node * dev , u32 cfg_phys , int primary ) --
1.5.2.4
On Thu, Aug 09, 2007 at 02:18:40PM -0500, Nathan Lynch wrote: Signed-off-by: Nathan Lynch <redacted>
Acked-by: Olof Johansson <redacted>
Thanks!
-Olof