Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Tue, 27 Jul 2021 12:18:23 +0200
From:   Robert Richter <rric@kernel.org>
To:     Colin King <colin.king@canonical.com>
Cc:     Borislav Petkov <bp@alien8.de>,
        Mauro Carvalho Chehab <mchehab@kernel.org>,
        Tony Luck <tony.luck@intel.com>,
        James Morse <james.morse@arm.com>,
        Doug Thompson <dougthompson@xmission.com>,
        Andrew Morton <akpm@linux-foundation.org>,
        linux-edac@vger.kernel.org, kernel-janitors@vger.kernel.org,
        linux-kernel@vger.kernel.org
Subject: Re: [PATCH] drivers/edac: add missing macro arguments and missing
 macro edac_pci_remove_sysfs
Message-ID: <YP/db1lKhkVxmHRs@rric.localdomain>
References: <20210715135826.26241-1-colin.king@canonical.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20210715135826.26241-1-colin.king@canonical.com>
Precedence: bulk

On 15.07.21 14:58:26, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
> 
> The macros edac_pci_handle_pe and edac_pci_handle_npe are missing their
> arguments and don't match the function prototypes they replace. Also
> macro edac_pci_remove_sysfs is missing. Fix this by adding in the missing
> arguments and missing macro.
> 
> Fixes: d4c1465b7de9 ("drivers/edac: fix edac_pci sysfs")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>  drivers/edac/edac_module.h | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/edac/edac_module.h b/drivers/edac/edac_module.h
> index aa1f91688eb8..ed194ba2c207 100644
> --- a/drivers/edac/edac_module.h
> +++ b/drivers/edac/edac_module.h
> @@ -123,8 +123,9 @@ extern void edac_pci_handle_npe(struct edac_pci_ctl_info *pci,
>  #define edac_sysfs_pci_teardown()
>  #define edac_pci_get_check_errors()
>  #define edac_pci_get_poll_msec()
> -#define edac_pci_handle_pe()
> -#define edac_pci_handle_npe()
> +#define edac_pci_remove_sysfs(pci)
> +#define edac_pci_handle_pe(pci, msg)
> +#define edac_pci_handle_npe(pci, msg)

All drivers of those functions are guarded by CONFIG_PCI (all except
EDAC_MPC85XX by Kconfig dependency and for mpc85xx it is inline). Not
protected is only:

 drivers/edac/edac_module.c:     edac_pci_clear_parity_errors();
 drivers/edac/edac_pci.c:        edac_pci_remove_sysfs(pci);
 drivers/edac/edac_pci.c:        if (edac_pci_get_check_errors())
 drivers/edac/edac_pci.c:        msec = edac_pci_get_poll_msec();
 drivers/edac/edac_pci.c:                edac_queue_work(&pci->work, msecs_to_jiffies(edac_pci_get_poll_msec()));
 drivers/edac/edac_pci.c:        edac_pci_do_parity_check();

So instead of adding those stubs we should in fact remove the whole
!CONFIG_PCI part here, make edac_pci.c dependent on CONFIG_PCI too and
fix the use of edac_pci_clear_parity_errors() in modules.c which looks
wrong at this location anyway.

-Robert

>  #endif				/* CONFIG_PCI */
>  
>  #endif				/* __EDAC_MODULE_H__ */
> -- 
> 2.31.1
>