From: Adrian Bunk This patch makes needlessly global code static. Signed-off-by: Adrian Bunk Cc: Doug Thompson Signed-off-by: Andrew Morton --- drivers/edac/edac_mc.c | 25 +++++++++++-------------- drivers/edac/edac_mc.h | 8 -------- drivers/edac/k8_edac.c | 2 +- 3 files changed, 12 insertions(+), 23 deletions(-) diff -puN drivers/edac/edac_mc.c~drivers-edac-make-code-static drivers/edac/edac_mc.c --- a/drivers/edac/edac_mc.c~drivers-edac-make-code-static +++ a/drivers/edac/edac_mc.c @@ -177,7 +177,7 @@ static struct sysfs_ops memctrlfs_ops = }; #define MEMCTRL_ATTR(_name,_mode,_show,_store) \ -struct memctrl_dev_attribute attr_##_name = { \ +static struct memctrl_dev_attribute attr_##_name = { \ .attr = {.name = __stringify(_name), .mode = _mode }, \ .value = &_name, \ .show = _show, \ @@ -185,7 +185,7 @@ struct memctrl_dev_attribute attr_##_nam }; #define MEMCTRL_STRING_ATTR(_name,_data,_mode,_show,_store) \ -struct memctrl_dev_attribute attr_##_name = { \ +static struct memctrl_dev_attribute attr_##_name = { \ .attr = {.name = __stringify(_name), .mode = _mode }, \ .value = _data, \ .show = _show, \ @@ -333,7 +333,7 @@ static struct sysfs_ops edac_pci_sysfs_o }; #define EDAC_PCI_ATTR(_name,_mode,_show,_store) \ -struct edac_pci_dev_attribute edac_pci_attr_##_name = { \ +static struct edac_pci_dev_attribute edac_pci_attr_##_name = { \ .attr = {.name = __stringify(_name), .mode = _mode }, \ .value = &_name, \ .show = _show, \ @@ -341,7 +341,7 @@ struct edac_pci_dev_attribute edac_pci_a }; #define EDAC_PCI_STRING_ATTR(_name,_data,_mode,_show,_store) \ -struct edac_pci_dev_attribute edac_pci_attr_##_name = { \ +static struct edac_pci_dev_attribute edac_pci_attr_##_name = { \ .attr = {.name = __stringify(_name), .mode = _mode }, \ .value = _data, \ .show = _show, \ @@ -712,7 +712,7 @@ static struct sysfs_ops csrowfs_ops = { }; #define CSROWDEV_ATTR(_name,_mode,_show,_store,_private) \ -struct csrowdev_attribute attr_##_name = { \ +static struct csrowdev_attribute attr_##_name = { \ .attr = {.name = __stringify(_name), .mode = _mode }, \ .show = _show, \ .store = _store, \ @@ -1005,7 +1005,7 @@ static struct sysfs_ops mci_ops = { }; #define MCIDEV_ATTR(_name,_mode,_show,_store) \ -struct mcidev_attribute mci_attr_##_name = { \ +static struct mcidev_attribute mci_attr_##_name = { \ .attr = {.name = __stringify(_name), .mode = _mode }, \ .show = _show, \ .store = _store, \ @@ -1155,7 +1155,7 @@ static void edac_remove_sysfs_mci_device #ifdef CONFIG_EDAC_DEBUG -void edac_mc_dump_channel(struct channel_info *chan) +static void edac_mc_dump_channel(struct channel_info *chan) { debugf4("\tchannel = %p\n", chan); debugf4("\tchannel->chan_idx = %d\n", chan->chan_idx); @@ -1163,9 +1163,8 @@ void edac_mc_dump_channel(struct channel debugf4("\tchannel->label = '%s'\n", chan->label); debugf4("\tchannel->csrow = %p\n\n", chan->csrow); } -EXPORT_SYMBOL_GPL(edac_mc_dump_channel); -void edac_mc_dump_csrow(struct csrow_info *csrow) +static void edac_mc_dump_csrow(struct csrow_info *csrow) { debugf4("\tcsrow = %p\n", csrow); debugf4("\tcsrow->csrow_idx = %d\n", csrow->csrow_idx); @@ -1179,9 +1178,8 @@ void edac_mc_dump_csrow(struct csrow_inf debugf4("\tcsrow->channels = %p\n", csrow->channels); debugf4("\tcsrow->mci = %p\n\n", csrow->mci); } -EXPORT_SYMBOL_GPL(edac_mc_dump_csrow); -void edac_mc_dump_mci(struct mem_ctl_info *mci) +static void edac_mc_dump_mci(struct mem_ctl_info *mci) { debugf3("\tmci = %p\n", mci); debugf3("\tmci->mtype_cap = %lx\n", mci->mtype_cap); @@ -1195,7 +1193,6 @@ void edac_mc_dump_mci(struct mem_ctl_inf mci->mod_name, mci->ctl_name); debugf3("\tpvt_info = %p\n\n", mci->pvt_info); } -EXPORT_SYMBOL_GPL(edac_mc_dump_mci); #endif /* CONFIG_EDAC_DEBUG */ @@ -1511,7 +1508,8 @@ struct mem_ctl_info * edac_mc_del_mc(str } EXPORT_SYMBOL_GPL(edac_mc_del_mc); -void edac_mc_scrub_block(unsigned long page, unsigned long offset, u32 size) +static void edac_mc_scrub_block(unsigned long page, unsigned long offset, + u32 size) { struct page *pg; void *virt_addr; @@ -1540,7 +1538,6 @@ void edac_mc_scrub_block(unsigned long p if (PageHighMem(pg)) local_irq_restore(flags); } -EXPORT_SYMBOL_GPL(edac_mc_scrub_block); /* FIXME - should return -1 */ int edac_mc_find_csrow_by_page(struct mem_ctl_info *mci, unsigned long page) diff -puN drivers/edac/edac_mc.h~drivers-edac-make-code-static drivers/edac/edac_mc.h --- a/drivers/edac/edac_mc.h~drivers-edac-make-code-static +++ a/drivers/edac/edac_mc.h @@ -406,19 +406,11 @@ static inline void pci_write_bits32(stru #endif /* CONFIG_PCI */ -#ifdef CONFIG_EDAC_DEBUG -void edac_mc_dump_channel(struct channel_info *chan); -void edac_mc_dump_mci(struct mem_ctl_info *mci); -void edac_mc_dump_csrow(struct csrow_info *csrow); -#endif /* CONFIG_EDAC_DEBUG */ - extern struct mem_ctl_info * edac_mc_find(int idx); extern int edac_mc_add_mc(struct mem_ctl_info *mci,int mc_idx); extern struct mem_ctl_info * edac_mc_del_mc(struct device *dev); extern int edac_mc_find_csrow_by_page(struct mem_ctl_info *mci, unsigned long page); -extern void edac_mc_scrub_block(unsigned long page, unsigned long offset, - u32 size); /* * The no info errors are used when error overflows are reported. diff -puN drivers/edac/k8_edac.c~drivers-edac-make-code-static drivers/edac/k8_edac.c --- a/drivers/edac/k8_edac.c~drivers-edac-make-code-static +++ a/drivers/edac/k8_edac.c @@ -1864,7 +1864,7 @@ static struct pci_driver k8_driver = { .id_table = k8_pci_tbl, }; -int __init k8_init(void) +static int __init k8_init(void) { return pci_module_init(&k8_driver); } _