> -----Original Message----- > From: SF Markus Elfring [mailto:elfring@xxxxxxxxxxxxxxxxxxxxx] > Sent: Friday, November 3, 2017 3:50 PM > To: devel@xxxxxxxxxxxxxxxxxxxx; *S-Par-Maintainer > <SParMaintainer@xxxxxxxxxx>; Thompson, Bryan E. > <bryan.thompson@xxxxxxxxxx>; Binder, David Anthony > <David.Binder@xxxxxxxxxx>; Kershner, David A > <David.Kershner@xxxxxxxxxx>; Greg Kroah-Hartman > <gregkh@xxxxxxxxxxxxxxxxxxx>; Sameer Wadgaonkar > <sameer.wadgaonkar@xxxxxxxxxx>; Sell, Timothy C > <Timothy.Sell@xxxxxxxxxx> > Cc: LKML <linux-kernel@xxxxxxxxxxxxxxx>; kernel-janitors@xxxxxxxxxxxxxxx > Subject: [PATCH] staging: unisys: visorchipset: Use common error handling > code in setup_crash_devices_work_queue() > > From: Markus Elfring <elfring@xxxxxxxxxxxxxxxxxxxxx> > Date: Fri, 3 Nov 2017 20:37:03 +0100 > > * Add a jump target so that a specific error message is stored only once > at the end of this function implementation. > > * Replace four calls of the function "dev_err" by goto statements. > > This issue was detected by using the Coccinelle software. > > Signed-off-by: Markus Elfring <elfring@xxxxxxxxxxxxxxxxxxxxx> Thanks for the catch! Acked-by: David Kershner <david.kershner@xxxxxxxxxx> > --- > drivers/staging/unisys/visorbus/visorchipset.c | 36 > ++++++++++++------------ > -- > 1 file changed, 16 insertions(+), 20 deletions(-) > > diff --git a/drivers/staging/unisys/visorbus/visorchipset.c > b/drivers/staging/unisys/visorbus/visorchipset.c > index fed554a43151..1d54821dd7b6 100644 > --- a/drivers/staging/unisys/visorbus/visorchipset.c > +++ b/drivers/staging/unisys/visorbus/visorchipset.c > @@ -1231,11 +1231,9 @@ static void > setup_crash_devices_work_queue(struct work_struct *work) > if (visorchannel_read(chipset_dev->controlvm_channel, > offsetof(struct visor_controlvm_channel, > saved_crash_message_count), > - &local_crash_msg_count, sizeof(u16)) < 0) { > - dev_err(&chipset_dev->acpi_device->dev, > - "failed to read channel\n"); > - return; > - } > + &local_crash_msg_count, sizeof(u16)) < 0) > + goto report_read_failure; > + > if (local_crash_msg_count != CONTROLVM_CRASHMSG_MAX) { > dev_err(&chipset_dev->acpi_device->dev, "invalid > count\n"); > return; > @@ -1244,30 +1242,24 @@ static void > setup_crash_devices_work_queue(struct work_struct *work) > if (visorchannel_read(chipset_dev->controlvm_channel, > offsetof(struct visor_controlvm_channel, > saved_crash_message_offset), > - &local_crash_msg_offset, sizeof(u32)) < 0) { > - dev_err(&chipset_dev->acpi_device->dev, > - "failed to read channel\n"); > - return; > - } > + &local_crash_msg_offset, sizeof(u32)) < 0) > + goto report_read_failure; > + > /* read create device message for storage bus offset */ > if (visorchannel_read(chipset_dev->controlvm_channel, > local_crash_msg_offset, > &local_crash_bus_msg, > - sizeof(struct controlvm_message)) < 0) { > - dev_err(&chipset_dev->acpi_device->dev, > - "failed to read channel\n"); > - return; > - } > + sizeof(struct controlvm_message)) < 0) > + goto report_read_failure; > + > /* read create device message for storage device */ > if (visorchannel_read(chipset_dev->controlvm_channel, > local_crash_msg_offset + > sizeof(struct controlvm_message), > &local_crash_dev_msg, > - sizeof(struct controlvm_message)) < 0) { > - dev_err(&chipset_dev->acpi_device->dev, > - "failed to read channel\n"); > - return; > - } > + sizeof(struct controlvm_message)) < 0) > + goto report_read_failure; > + > /* reuse IOVM create bus message */ > if (!local_crash_bus_msg.cmd.create_bus.channel_addr) { > dev_err(&chipset_dev->acpi_device->dev, > @@ -1282,6 +1274,10 @@ static void > setup_crash_devices_work_queue(struct work_struct *work) > return; > } > visorbus_device_create(&local_crash_dev_msg); > + return; > + > +report_read_failure: > + dev_err(&chipset_dev->acpi_device->dev, "failed to read > channel\n"); > } > > void visorbus_response(struct visor_device *bus_info, int response, > -- > 2.15.0
Attachment:
smime.p7s
Description: S/MIME cryptographic signature
