| Message ID | 20190919171713.8060-3-hhhawa@amazon.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Add an API for edac device, for mulriple errors | expand |
On 19.09.19 18:17:13, Hanna Hawa wrote: > Move edac_device_handle_*() functions from source file to header file as > inline funtcion that use the new API with single error. > > Signed-off-by: Hanna Hawa <hhhawa@amazon.com> With the changes below it looks good to me: Acked-by: Robert Richter <rrichter@marvell.com> Thanks, -Robert > diff --git a/drivers/edac/edac_device.h b/drivers/edac/edac_device.h > index 30dc5f5979c8..796ea134a691 100644 > --- a/drivers/edac/edac_device.h > +++ b/drivers/edac/edac_device.h > @@ -285,29 +285,6 @@ extern int edac_device_add_device(struct edac_device_ctl_info *edac_dev); > */ > extern struct edac_device_ctl_info *edac_device_del_device(struct device *dev); > > -/** > - * edac_device_handle_ue(): > - * perform a common output and handling of an 'edac_dev' UE event > - * > - * @edac_dev: pointer to struct &edac_device_ctl_info > - * @inst_nr: number of the instance where the UE error happened > - * @block_nr: number of the block where the UE error happened > - * @msg: message to be printed > - */ > -extern void edac_device_handle_ue(struct edac_device_ctl_info *edac_dev, > - int inst_nr, int block_nr, const char *msg); > -/** > - * edac_device_handle_ce(): > - * perform a common output and handling of an 'edac_dev' CE event > - * > - * @edac_dev: pointer to struct &edac_device_ctl_info > - * @inst_nr: number of the instance where the CE error happened > - * @block_nr: number of the block where the CE error happened > - * @msg: message to be printed > - */ > -extern void edac_device_handle_ce(struct edac_device_ctl_info *edac_dev, > - int inst_nr, int block_nr, const char *msg); > - Just put in the inline replacement here. > /** > * edac_device_alloc_index: Allocate a unique device index number > * > @@ -357,4 +334,18 @@ static inline void edac_device_handle_ue_count(struct edac_device_ctl_info *edac > { > __edac_device_handle_ue(edac_dev, count, inst_nr, block_nr, msg); > } > + > +static inline void edac_device_handle_ce(struct edac_device_ctl_info *edac_dev, > + int inst_nr, int block_nr, No need for this linebreak. > + const char *msg) > +{ > + __edac_device_handle_ce(edac_dev, 1, inst_nr, block_nr, msg); > +} > + > +static inline void edac_device_handle_ue(struct edac_device_ctl_info *edac_dev, > + int inst_nr, int block_nr, Same here. > + const char *msg) > +{ > + __edac_device_handle_ue(edac_dev, 1, inst_nr, block_nr, msg); > +} > #endif > -- > 2.17.1 >
On 9/20/2019 9:49 AM, Robert Richter wrote: > On 19.09.19 18:17:13, Hanna Hawa wrote: >> Move edac_device_handle_*() functions from source file to header file as >> inline funtcion that use the new API with single error. >> >> Signed-off-by: Hanna Hawa <hhhawa@amazon.com> > > With the changes below it looks good to me: > > Acked-by: Robert Richter <rrichter@marvell.com> > > Thanks, > > -Robert > >> diff --git a/drivers/edac/edac_device.h b/drivers/edac/edac_device.h >> index 30dc5f5979c8..796ea134a691 100644 >> --- a/drivers/edac/edac_device.h >> +++ b/drivers/edac/edac_device.h >> @@ -285,29 +285,6 @@ extern int edac_device_add_device(struct edac_device_ctl_info *edac_dev); >> */ >> extern struct edac_device_ctl_info *edac_device_del_device(struct device *dev); >> >> -/** >> - * edac_device_handle_ue(): >> - * perform a common output and handling of an 'edac_dev' UE event >> - * >> - * @edac_dev: pointer to struct &edac_device_ctl_info >> - * @inst_nr: number of the instance where the UE error happened >> - * @block_nr: number of the block where the UE error happened >> - * @msg: message to be printed >> - */ >> -extern void edac_device_handle_ue(struct edac_device_ctl_info *edac_dev, >> - int inst_nr, int block_nr, const char *msg); >> -/** >> - * edac_device_handle_ce(): >> - * perform a common output and handling of an 'edac_dev' CE event >> - * >> - * @edac_dev: pointer to struct &edac_device_ctl_info >> - * @inst_nr: number of the instance where the CE error happened >> - * @block_nr: number of the block where the CE error happened >> - * @msg: message to be printed >> - */ >> -extern void edac_device_handle_ce(struct edac_device_ctl_info *edac_dev, >> - int inst_nr, int block_nr, const char *msg); >> - > > Just put in the inline replacement here. I'll re-arrange the functions in patches 1/2 and put the *edac_device_handle_* functions here instead of end of file. > >> /** >> * edac_device_alloc_index: Allocate a unique device index number >> * >> @@ -357,4 +334,18 @@ static inline void edac_device_handle_ue_count(struct edac_device_ctl_info *edac >> { >> __edac_device_handle_ue(edac_dev, count, inst_nr, block_nr, msg); >> } >> + >> +static inline void edac_device_handle_ce(struct edac_device_ctl_info *edac_dev, >> + int inst_nr, int block_nr, > > No need for this linebreak. It'll be more than 80 characters. > >> + const char *msg) >> +{ >> + __edac_device_handle_ce(edac_dev, 1, inst_nr, block_nr, msg); >> +} >> + >> +static inline void edac_device_handle_ue(struct edac_device_ctl_info *edac_dev, >> + int inst_nr, int block_nr, > > Same here. > >> + const char *msg) >> +{ >> + __edac_device_handle_ue(edac_dev, 1, inst_nr, block_nr, msg); >> +} >> #endif >> -- >> 2.17.1 >>
diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c index 866934f2bcb0..d54223594916 100644 --- a/drivers/edac/edac_device.c +++ b/drivers/edac/edac_device.c @@ -651,17 +651,3 @@ void __edac_device_handle_ue(struct edac_device_ctl_info *edac_dev, block ? block->name : "N/A", count, msg); } EXPORT_SYMBOL_GPL(__edac_device_handle_ue); - -void edac_device_handle_ce(struct edac_device_ctl_info *edac_dev, - int inst_nr, int block_nr, const char *msg) -{ - __edac_device_handle_ce(edac_dev, 1, inst_nr, block_nr, msg); -} -EXPORT_SYMBOL_GPL(edac_device_handle_ce); - -void edac_device_handle_ue(struct edac_device_ctl_info *edac_dev, - int inst_nr, int block_nr, const char *msg) -{ - __edac_device_handle_ue(edac_dev, 1, inst_nr, block_nr, msg); -} -EXPORT_SYMBOL_GPL(edac_device_handle_ue); diff --git a/drivers/edac/edac_device.h b/drivers/edac/edac_device.h index 30dc5f5979c8..796ea134a691 100644 --- a/drivers/edac/edac_device.h +++ b/drivers/edac/edac_device.h @@ -285,29 +285,6 @@ extern int edac_device_add_device(struct edac_device_ctl_info *edac_dev); */ extern struct edac_device_ctl_info *edac_device_del_device(struct device *dev); -/** - * edac_device_handle_ue(): - * perform a common output and handling of an 'edac_dev' UE event - * - * @edac_dev: pointer to struct &edac_device_ctl_info - * @inst_nr: number of the instance where the UE error happened - * @block_nr: number of the block where the UE error happened - * @msg: message to be printed - */ -extern void edac_device_handle_ue(struct edac_device_ctl_info *edac_dev, - int inst_nr, int block_nr, const char *msg); -/** - * edac_device_handle_ce(): - * perform a common output and handling of an 'edac_dev' CE event - * - * @edac_dev: pointer to struct &edac_device_ctl_info - * @inst_nr: number of the instance where the CE error happened - * @block_nr: number of the block where the CE error happened - * @msg: message to be printed - */ -extern void edac_device_handle_ce(struct edac_device_ctl_info *edac_dev, - int inst_nr, int block_nr, const char *msg); - /** * edac_device_alloc_index: Allocate a unique device index number * @@ -357,4 +334,18 @@ static inline void edac_device_handle_ue_count(struct edac_device_ctl_info *edac { __edac_device_handle_ue(edac_dev, count, inst_nr, block_nr, msg); } + +static inline void edac_device_handle_ce(struct edac_device_ctl_info *edac_dev, + int inst_nr, int block_nr, + const char *msg) +{ + __edac_device_handle_ce(edac_dev, 1, inst_nr, block_nr, msg); +} + +static inline void edac_device_handle_ue(struct edac_device_ctl_info *edac_dev, + int inst_nr, int block_nr, + const char *msg) +{ + __edac_device_handle_ue(edac_dev, 1, inst_nr, block_nr, msg); +} #endif
Move edac_device_handle_*() functions from source file to header file as inline funtcion that use the new API with single error. Signed-off-by: Hanna Hawa <hhhawa@amazon.com> --- drivers/edac/edac_device.c | 14 -------------- drivers/edac/edac_device.h | 37 ++++++++++++++----------------------- 2 files changed, 14 insertions(+), 37 deletions(-)