| Message ID | f581efc8-5d92-fed7-27b5-d5c5e9bce8ee@huawei.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | ehea: replace with page_shift() in ehea_is_hugepage() | expand |
From: Yunfeng Ye <yeyunfeng@huawei.com> Date: Tue, 5 Nov 2019 19:30:45 +0800 > The function page_shift() is supported after the commit 94ad9338109f > ("mm: introduce page_shift()"). > > So replace with page_shift() in ehea_is_hugepage() for readability. > > Signed-off-by: Yunfeng Ye <yeyunfeng@huawei.com> Applied to net-next.
diff --git a/drivers/net/ethernet/ibm/ehea/ehea_qmr.c b/drivers/net/ethernet/ibm/ehea/ehea_qmr.c index 6e70658d50c4..db45373ea31c 100644 --- a/drivers/net/ethernet/ibm/ehea/ehea_qmr.c +++ b/drivers/net/ethernet/ibm/ehea/ehea_qmr.c @@ -670,13 +670,10 @@ int ehea_rem_sect_bmap(unsigned long pfn, unsigned long nr_pages) static int ehea_is_hugepage(unsigned long pfn) { - int page_order; - if (pfn & EHEA_HUGEPAGE_PFN_MASK) return 0; - page_order = compound_order(pfn_to_page(pfn)); - if (page_order + PAGE_SHIFT != EHEA_HUGEPAGESHIFT) + if (page_shift(pfn_to_page(pfn)) != EHEA_HUGEPAGESHIFT) return 0; return 1;
The function page_shift() is supported after the commit 94ad9338109f ("mm: introduce page_shift()"). So replace with page_shift() in ehea_is_hugepage() for readability. Signed-off-by: Yunfeng Ye <yeyunfeng@huawei.com> --- drivers/net/ethernet/ibm/ehea/ehea_qmr.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)