Skip to contentSkip to conversation

Staging: unisys: virtpci: fixed coding style errors

PATCH In review Andrew Milkovich 2 participants 5 messages Jan 17, 2015 – Jan 18, 2015 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Staging: unisys: virtpci: fixed coding style errors

Fixed coding style errors per checkpatch.pl. Inline comments removed; chanptr comment is implied by the first argument being the channel. No parent bus comment is already understood by the argument being NULL.

---
 drivers/staging/unisys/virtpci/virtpci.c | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)
drivers/staging/unisys/virtpci/virtpci.c +0 -0
index 39b828d..1bb0946 100644
@@ -279,10 +279,8 @@ static int add_vbus(struct add_vbus_guestpart *addparams)
		POSTCODE_LINUX_2(VPCI_CREATE_FAILURE_PC, POSTCODE_SEVERITY_ERR);
		return 0;
	}

- write_vbus_chp_info(vbus->platform_data /* chanptr */ ,
- &chipset_driver_info);
- write_vbus_bus_info(vbus->platform_data /* chanptr */ ,
- &bus_driver_info);
+ write_vbus_chp_info(vbus->platform_data, &chipset_driver_info);

+	write_vbus_bus_info(vbus->platform_data, &bus_driver_info);
	LOGINF("Added vbus %d; device %s created successfully\n",
	       addparams->bus_no, BUS_ID(vbus));
	POSTCODE_LINUX_2(VPCI_CREATE_EXIT_PC, POSTCODE_SEVERITY_INFO);
@@ -466,8 +464,7 @@ static int pause_vhba(struct pause_virt_guestpart *pauseparams)
	GET_SCSIADAPINFO_FROM_CHANPTR(pauseparams->chanptr);

	LOGINF("Pausing vhba wwnn:%x:%x\n", scsi.wwnn.wwnn1, scsi.wwnn.wwnn2);
-	i = virtpci_device_serverdown(NULL /*no parent bus */ , VIRTHBA_TYPE,
-				      &scsi.wwnn, NULL);
+	i = virtpci_device_serverdown(NULL, VIRTHBA_TYPE, &scsi.wwnn, NULL);
	if (i)
		LOGINF("Paused vhba wwnn:%x:%x\n", scsi.wwnn.wwnn1,
		       scsi.wwnn.wwnn2);
@@ -487,8 +484,7 @@ static int pause_vnic(struct pause_virt_guestpart *pauseparams)
	LOGINF("Pausing vnic macaddr:%02x:%02x:%02x:%02x:%02x:%02x\n",
	       net.mac_addr[0], net.mac_addr[1], net.mac_addr[2],
	       net.mac_addr[3], net.mac_addr[4], net.mac_addr[5]);
-	i = virtpci_device_serverdown(NULL /*no parent bus */ , VIRTNIC_TYPE,
-				      NULL, net.mac_addr);
+	i = virtpci_device_serverdown(NULL, VIRTNIC_TYPE, NULL, net.mac_addr);
	if (i) {
		LOGINF(" Paused vnic macaddr:%02x:%02x:%02x:%02x:%02x:%02x\n",
		       net.mac_addr[0], net.mac_addr[1], net.mac_addr[2],
@@ -508,8 +504,7 @@ static int resume_vhba(struct resume_virt_guestpart *resumeparams)
	GET_SCSIADAPINFO_FROM_CHANPTR(resumeparams->chanptr);

	LOGINF("Resuming vhba wwnn:%x:%x\n", scsi.wwnn.wwnn1, scsi.wwnn.wwnn2);
-	i = virtpci_device_serverup(NULL /*no parent bus */ , VIRTHBA_TYPE,
-				    &scsi.wwnn, NULL);
+	i = virtpci_device_serverup(NULL, VIRTHBA_TYPE, &scsi.wwnn, NULL);
	if (i)
		LOGINF("Resumed vhba wwnn:%x:%x\n", scsi.wwnn.wwnn1,
		       scsi.wwnn.wwnn2);
@@ -530,8 +525,7 @@ resume_vnic(struct resume_virt_guestpart *resumeparams)
	LOGINF("Resuming vnic macaddr:%02x:%02x:%02x:%02x:%02x:%02x\n",
	       net.mac_addr[0], net.mac_addr[1], net.mac_addr[2],
	       net.mac_addr[3], net.mac_addr[4], net.mac_addr[5]);
-	i = virtpci_device_serverup(NULL /*no parent bus */ , VIRTNIC_TYPE,
-				    NULL, net.mac_addr);
+	i = virtpci_device_serverup(NULL, VIRTNIC_TYPE, NULL, net.mac_addr);
	if (i) {
		LOGINF(" Resumed vnic macaddr:%02x:%02x:%02x:%02x:%02x:%02x\n",
		       net.mac_addr[0], net.mac_addr[1], net.mac_addr[2],
@@ -551,8 +545,7 @@ static int delete_vhba(struct del_virt_guestpart *delparams)
	GET_SCSIADAPINFO_FROM_CHANPTR(delparams->chanptr);

	LOGINF("Deleting vhba wwnn:%x:%x\n", scsi.wwnn.wwnn1, scsi.wwnn.wwnn2);
-	i = virtpci_device_del(NULL /*no parent bus */ , VIRTHBA_TYPE,
-			       &scsi.wwnn, NULL);
+	i = virtpci_device_del(NULL, VIRTHBA_TYPE, &scsi.wwnn, NULL);
	if (i) {
		LOGINF("Deleted vhba wwnn:%x:%x\n", scsi.wwnn.wwnn1,
		       scsi.wwnn.wwnn2);
@@ -574,8 +567,7 @@ static int delete_vnic(struct del_virt_guestpart *delparams)
	LOGINF("Deleting vnic macaddr:%02x:%02x:%02x:%02x:%02x:%02x\n",
	       net.mac_addr[0], net.mac_addr[1], net.mac_addr[2],
	       net.mac_addr[3], net.mac_addr[4], net.mac_addr[5]);
-	i = virtpci_device_del(NULL /*no parent bus */ , VIRTNIC_TYPE, NULL,
-			       net.mac_addr);
+	i = virtpci_device_del(NULL, VIRTNIC_TYPE, NULL, net.mac_addr);
	if (i) {
		LOGINF("Deleted vnic macaddr:%02x:%02x:%02x:%02x:%02x:%02x\n",
		       net.mac_addr[0], net.mac_addr[1], net.mac_addr[2],

--
2.2.2

maintainer
#1 lore raw
Quoted 8 lines · Andrew Milkovich

Fixed coding style errors per checkpatch.pl. Inline comments removed; chanptr comment is implied by the first argument being the channel. No parent bus comment is already understood by the argument being NULL.

---
 drivers/staging/unisys/virtpci/virtpci.c | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

This doesn't apply to my staging-testing branch at all, sorry.

greg k-h

#2 lore raw

Hi,

Quoted 5 lines · Greg KH
Quoted 4 lines · Andrew Milkovich

Fixed coding style errors per checkpatch.pl. Inline comments removed; chanptr comment is implied by the first argument being the channel. No parent bus comment is already understood by the argument being NULL.

Quoted 8 lines
Quoted 4 lines
---
 drivers/staging/unisys/virtpci/virtpci.c | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

This doesn't apply to my staging-testing branch at all, sorry.

greg k-h

Processing the patch with 'git apply' complains about a corruption; this is due to the fact that I ran cleanfile on the patch. The checkpatch.pl script was giving errors about trailing whitespace. I ran cleanpatch, errors still showed up, I ran cleanfile and it passed.

Using 'patch -p1 < patchname' seems to work.

I can resubmit the patch but for 'git apply' to work it will be failing the checkpatch.pl script. What should I do in this case?

Andrew Milkovich

maintainer
#3 lore raw
Quoted 15 lines · Andrew Milkovich

Hi,

Quoted 12 lines · Greg KH
Quoted 8 lines · Andrew Milkovich

Fixed coding style errors per checkpatch.pl. Inline comments removed; chanptr comment is implied by the first argument being the channel. No parent bus comment is already understood by the argument being NULL.

---
 drivers/staging/unisys/virtpci/virtpci.c | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

This doesn't apply to my staging-testing branch at all, sorry.

Quoted 8 lines
Quoted 1 line

greg k-h

Processing the patch with 'git apply' complains about a corruption; this is due to the fact that I ran cleanfile on the patch. The checkpatch.pl script was giving errors about trailing whitespace. I ran cleanpatch, errors still showed up, I ran cleanfile and it passed.

Using 'patch -p1 < patchname' seems to work.

Doesn't work for me, try it against the branch above, I think it was due to other changes in this driver in my tree.

If not, just resend, maybe I messed something up on my end, it has been known to happen :)

thanks,

greg k-h

#4 lore raw
In reply to Greg KH

Hi again,

Quoted 5 lines · Greg KH
Quoted 4 lines · Andrew Milkovich

Fixed coding style errors per checkpatch.pl. Inline comments removed; chanptr comment is implied by the first argument being the channel. No parent bus comment is already understood by the argument being NULL.

Quoted 8 lines
Quoted 4 lines
---
 drivers/staging/unisys/virtpci/virtpci.c | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

This doesn't apply to my staging-testing branch at all, sorry.

greg k-h

Looks like the '-f' switch on checkpatch.pl was the reason I was getting whitespace errors.

I'll resubmit the proper patch.