remove redundant macros
PATCH 1/1 remove redundant macros
This patch removes some redundant nasid conversion macros from arch.h and updates callers to use the version they were defined to instead.
Signed-off-by Jesse Barnes <[email protected]>
Thanks,
Jesse
===== arch/ia64/sn/kernel/io_init.c 1.5 vs edited =====
arch/ia64/sn/kernel/io_init.c +2 -2
@@ -136,7 +136,7 @@for (i =0 ; i < numionodes; i++) { hubdev = (struct hubdev_info *)(NODEPDA (i)->pdinfo); - nasid =COMPACT_TO_NASID_NODEID (i); + nasid =cnodeid_to_nasid (i); status =sal_get_hubdev_info (nasid, (uint64_t )__pa (hubdev));if (status)continue ;
@@ -313,7 +313,7 @@SN_PCIBUS_BUSSOFT (bus) = provider_soft; nasid =NASID_GET (SN_PCIBUS_BUSSOFT (bus)->bs_base); - cnode =NASID_TO_COMPACT_NODEID (nasid); + cnode =nasid_to_cnodeid (nasid); hubdev_info = (struct hubdev_info *)(NODEPDA (cnode)->pdinfo);SN_PCIBUS_BUSSOFT (bus)->bs_xwidget_info = &(hubdev_info->hdi_xwidget_info[SN_PCIBUS_BUSSOFT (bus)->bs_xid]);
===== arch/ia64/sn/pci/pcibr/pcibr_dma.c 1.2 vs edited =====
arch/ia64/sn/pci/pcibr/pcibr_dma.c +2 -2
@@ -226,10 +226,10 @@return ; nasid =NASID_GET (addr); -if (-1 ==NASID_TO_COMPACT_NODEID (nasid)) +if (-1 ==nasid_to_cnodeid (nasid))return ; - hubinfo = (NODEPDA (NASID_TO_COMPACT_NODEID (nasid)))->pdinfo; + hubinfo = (NODEPDA (nasid_to_cnodeid (nasid)))->pdinfo;if (!hubinfo) {BUG ();
===== arch/ia64/sn/pci/pcibr/pcibr_provider.c 1.1 vs edited =====
arch/ia64/sn/pci/pcibr/pcibr_provider.c +1 -1
@@ -98,7 +98,7 @@ } nasid =NASID_GET (soft->pbi_buscommon.bs_base); - cnode =NASID_TO_COMPACT_NODEID (nasid); + cnode =nasid_to_cnodeid (nasid); hubdev_info = (struct hubdev_info *)(NODEPDA (cnode)->pdinfo);if (hubdev_info->hdi_flush_nasid_list.widget_p) {
===== include/asm-ia64/sn/arch.h 1.12 vs edited =====
include/asm-ia64/sn/arch.h +0 -3
@@ -24,9 +24,6 @@typedef u64 nic_t ; -#define NASID_TO_COMPACT_NODEID (nasid) (nasid_to_cnodeid(nasid)) -#define COMPACT_TO_NASID_NODEID (cnode) (cnodeid_to_nasid(cnode)) -extern void sn_flush_all_caches (long addr,long bytes);#endif /* _ASM_IA64_SN_ARCH_H */