Re: [PATCH 01/10] staging: unisys: fix blank lines virthba
On Tue, Oct 28, 2014 at 06:42:37PM -0400, Erik Arfvidson wrote: This patch removes unnecessary blanks lines and adds necessary blank lines in virthba. Signed-off-by: Erik Arfvidson erik.arfvid...@unisys.com --- drivers/staging/unisys/virthba/virthba.c | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) This series doesn't apply, can you please refresh it against my latest staging-testing branch of staging.git and resend? thanks, greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 01/10] staging: unisys: fix blank lines virthba
This patch removes unnecessary blanks lines and adds necessary blank lines in virthba. Signed-off-by: Erik Arfvidson erik.arfvid...@unisys.com --- drivers/staging/unisys/virthba/virthba.c | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/staging/unisys/virthba/virthba.c b/drivers/staging/unisys/virthba/virthba.c index ee1be5a..7475124 100644 --- a/drivers/staging/unisys/virthba/virthba.c +++ b/drivers/staging/unisys/virthba/virthba.c @@ -101,7 +101,6 @@ static DEF_SCSI_QCMD(virthba_queue_command) #define virthba_queue_command virthba_queue_command_lck #endif - static int virthba_slave_alloc(struct scsi_device *scsidev); static int virthba_slave_configure(struct scsi_device *scsidev); static void virthba_slave_destroy(struct scsi_device *scsidev); @@ -166,6 +165,7 @@ struct virtdisk_info { atomic_t error_count; struct virtdisk_info *next; }; + /* Each Scsi_Host has a host_data area that contains this struct. */ struct virthba_info { struct Scsi_Host *scsihost; @@ -990,7 +990,6 @@ virthba_queue_command_lck(struct scsi_cmnd *scsicmd, sgl = scsi_sglist(scsicmd); for_each_sg(sgl, sg, scsi_sg_count(scsicmd), i) { - cmdrsp-scsi.gpi_list[i].address = sg_phys(sg); cmdrsp-scsi.gpi_list[i].length = sg-length; if ((i != 0) (sg-offset != 0)) @@ -1208,7 +1207,6 @@ do_scsi_nolinuxstat(struct uiscmdrsp *cmdrsp, struct scsi_cmnd *scsicmd) bufind += sg[i].length; } } else { - vdisk = ((struct virthba_info *)scsidev-host-hostdata)-head; for ( ; vdisk-next; vdisk = vdisk-next) { if ((scsidev-channel != vdisk-channel) @@ -1323,7 +1321,6 @@ drain_queue(struct virthba_info *virthbainfo, struct chaninfo *dc, } } - /* main function for the thread that waits for scsi commands to arrive * in a specified queue */ @@ -1657,7 +1654,6 @@ virthba_mod_init(void) POSTCODE_LINUX_3(VHBA_CREATE_FAILURE_PC, error, POSTCODE_SEVERITY_ERR); } else { - /* create the debugfs directories and entries */ virthba_debugfs_dir = debugfs_create_dir(virthba, NULL); debugfs_create_file(info, S_IRUSR, virthba_debugfs_dir, @@ -1748,7 +1744,6 @@ virthba_mod_exit(void) debugfs_remove_recursive(virthba_debugfs_dir); LOGINF(Leaving virthba_mod_exit\n); - } /* specify function to be run at module insertion time */ -- 1.9.1 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 01/10] staging: unisys: fix blank lines virthba
On Wed, Oct 29, 2014 at 12:24:57PM -0400, Erik Arfvidson wrote: This patch removes unnecessary blanks lines and adds necessary blank lines in virthba. Signed-off-by: Erik Arfvidson erik.arfvid...@unisys.com --- drivers/staging/unisys/virthba/virthba.c | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) This patch series still does not apply, please refresh it against my staging-testing branch of staging.git and resend. thanks, greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 01/10] staging: unisys: fix blank lines virthba
This patch removes unnecessary blanks lines and adds necessary blank lines in virthba. Signed-off-by: Erik Arfvidson erik.arfvid...@unisys.com --- drivers/staging/unisys/virthba/virthba.c | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/staging/unisys/virthba/virthba.c b/drivers/staging/unisys/virthba/virthba.c index ee1be5a..7475124 100644 --- a/drivers/staging/unisys/virthba/virthba.c +++ b/drivers/staging/unisys/virthba/virthba.c @@ -101,7 +101,6 @@ static DEF_SCSI_QCMD(virthba_queue_command) #define virthba_queue_command virthba_queue_command_lck #endif - static int virthba_slave_alloc(struct scsi_device *scsidev); static int virthba_slave_configure(struct scsi_device *scsidev); static void virthba_slave_destroy(struct scsi_device *scsidev); @@ -166,6 +165,7 @@ struct virtdisk_info { atomic_t error_count; struct virtdisk_info *next; }; + /* Each Scsi_Host has a host_data area that contains this struct. */ struct virthba_info { struct Scsi_Host *scsihost; @@ -990,7 +990,6 @@ virthba_queue_command_lck(struct scsi_cmnd *scsicmd, sgl = scsi_sglist(scsicmd); for_each_sg(sgl, sg, scsi_sg_count(scsicmd), i) { - cmdrsp-scsi.gpi_list[i].address = sg_phys(sg); cmdrsp-scsi.gpi_list[i].length = sg-length; if ((i != 0) (sg-offset != 0)) @@ -1208,7 +1207,6 @@ do_scsi_nolinuxstat(struct uiscmdrsp *cmdrsp, struct scsi_cmnd *scsicmd) bufind += sg[i].length; } } else { - vdisk = ((struct virthba_info *)scsidev-host-hostdata)-head; for ( ; vdisk-next; vdisk = vdisk-next) { if ((scsidev-channel != vdisk-channel) @@ -1323,7 +1321,6 @@ drain_queue(struct virthba_info *virthbainfo, struct chaninfo *dc, } } - /* main function for the thread that waits for scsi commands to arrive * in a specified queue */ @@ -1657,7 +1654,6 @@ virthba_mod_init(void) POSTCODE_LINUX_3(VHBA_CREATE_FAILURE_PC, error, POSTCODE_SEVERITY_ERR); } else { - /* create the debugfs directories and entries */ virthba_debugfs_dir = debugfs_create_dir(virthba, NULL); debugfs_create_file(info, S_IRUSR, virthba_debugfs_dir, @@ -1748,7 +1744,6 @@ virthba_mod_exit(void) debugfs_remove_recursive(virthba_debugfs_dir); LOGINF(Leaving virthba_mod_exit\n); - } /* specify function to be run at module insertion time */ -- 1.9.1 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 01/10] staging: unisys: fix blank lines virthba
This patch removes unnecessary blanks lines and adds necessary blank lines in virthba. Signed-off-by: Erik Arfvidson erik.arfvid...@unisys.com --- drivers/staging/unisys/virthba/virthba.c | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/staging/unisys/virthba/virthba.c b/drivers/staging/unisys/virthba/virthba.c index e4130c9..5733b23 100644 --- a/drivers/staging/unisys/virthba/virthba.c +++ b/drivers/staging/unisys/virthba/virthba.c @@ -101,7 +101,6 @@ static DEF_SCSI_QCMD(virthba_queue_command) #define virthba_queue_command virthba_queue_command_lck #endif - static int virthba_slave_alloc(struct scsi_device *scsidev); static int virthba_slave_configure(struct scsi_device *scsidev); static void virthba_slave_destroy(struct scsi_device *scsidev); @@ -166,6 +165,7 @@ struct virtdisk_info { atomic_t error_count; struct virtdisk_info *next; }; + /* Each Scsi_Host has a host_data area that contains this struct. */ struct virthba_info { struct Scsi_Host *scsihost; @@ -989,7 +989,6 @@ virthba_queue_command_lck(struct scsi_cmnd *scsicmd, sgl = scsi_sglist(scsicmd); for_each_sg(sgl, sg, scsi_sg_count(scsicmd), i) { - cmdrsp-scsi.gpi_list[i].address = sg_phys(sg); cmdrsp-scsi.gpi_list[i].length = sg-length; if ((i != 0) (sg-offset != 0)) @@ -1207,7 +1206,6 @@ do_scsi_nolinuxstat(struct uiscmdrsp *cmdrsp, struct scsi_cmnd *scsicmd) bufind += sg[i].length; } } else { - vdisk = ((struct virthba_info *)scsidev-host-hostdata)-head; for ( ; vdisk-next; vdisk = vdisk-next) { if ((scsidev-channel != vdisk-channel) @@ -1323,7 +1321,6 @@ drain_queue(struct virthba_info *virthbainfo, struct chaninfo *dc, } } - /* main function for the thread that waits for scsi commands to arrive * in a specified queue */ @@ -1657,7 +1654,6 @@ virthba_mod_init(void) POSTCODE_LINUX_3(VHBA_CREATE_FAILURE_PC, error, POSTCODE_SEVERITY_ERR); } else { - /* create the debugfs directories and entries */ virthba_debugfs_dir = debugfs_create_dir(virthba, NULL); debugfs_create_file(info, S_IRUSR, virthba_debugfs_dir, @@ -1748,7 +1744,6 @@ virthba_mod_exit(void) debugfs_remove_recursive(virthba_debugfs_dir); LOGINF(Leaving virthba_mod_exit\n); - } /* specify function to be run at module insertion time */ -- 1.9.1 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 01/10] staging: unisys: fix blank lines virthba
On Wed, Oct 22, 2014 at 05:52:21PM -0400, Erik Arfvidson wrote: This patch removes unnecessary blanks lines and adds necessary blank lines in virthba. Signed-off-by: Erik Arfvidson erik.arfvid...@unisys.com Signed-off-by: Benjamin Romer benjamin.ro...@unisys.com --- drivers/staging/unisys/virthba/virthba.c | 9 +++-- 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/staging/unisys/virthba/virthba.c b/drivers/staging/unisys/virthba/virthba.c index e4130c9..e8868ae2 100644 --- a/drivers/staging/unisys/virthba/virthba.c +++ b/drivers/staging/unisys/virthba/virthba.c @@ -101,7 +101,6 @@ static DEF_SCSI_QCMD(virthba_queue_command) #define virthba_queue_command virthba_queue_command_lck #endif - static int virthba_slave_alloc(struct scsi_device *scsidev); static int virthba_slave_configure(struct scsi_device *scsidev); static void virthba_slave_destroy(struct scsi_device *scsidev); @@ -166,6 +165,7 @@ struct virtdisk_info { atomic_t error_count; struct virtdisk_info *next; }; + /* Each Scsi_Host has a host_data area that contains this struct. */ struct virthba_info { struct Scsi_Host *scsihost; @@ -420,7 +420,9 @@ static irqreturn_t virthba_ISR(int irq, void *dev_id) { struct virthba_info *virthbainfo = (struct virthba_info *) dev_id; + CHANNEL_HEADER __iomem *pChannelHeader; + SIGNAL_QUEUE_HEADER __iomem *pqhdr; Same extra line problem here as well. Please fix both of those up and resend both series. thanks, greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 01/10] staging: unisys: fix blank lines virthba
This patch removes unnecessary blanks lines and adds necessary blank lines in virthba. Signed-off-by: Erik Arfvidson erik.arfvid...@unisys.com Signed-off-by: Benjamin Romer benjamin.ro...@unisys.com --- drivers/staging/unisys/virthba/virthba.c | 9 +++-- 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/staging/unisys/virthba/virthba.c b/drivers/staging/unisys/virthba/virthba.c index e4130c9..e8868ae2 100644 --- a/drivers/staging/unisys/virthba/virthba.c +++ b/drivers/staging/unisys/virthba/virthba.c @@ -101,7 +101,6 @@ static DEF_SCSI_QCMD(virthba_queue_command) #define virthba_queue_command virthba_queue_command_lck #endif - static int virthba_slave_alloc(struct scsi_device *scsidev); static int virthba_slave_configure(struct scsi_device *scsidev); static void virthba_slave_destroy(struct scsi_device *scsidev); @@ -166,6 +165,7 @@ struct virtdisk_info { atomic_t error_count; struct virtdisk_info *next; }; + /* Each Scsi_Host has a host_data area that contains this struct. */ struct virthba_info { struct Scsi_Host *scsihost; @@ -420,7 +420,9 @@ static irqreturn_t virthba_ISR(int irq, void *dev_id) { struct virthba_info *virthbainfo = (struct virthba_info *) dev_id; + CHANNEL_HEADER __iomem *pChannelHeader; + SIGNAL_QUEUE_HEADER __iomem *pqhdr; u64 mask; unsigned long long rc1; @@ -989,7 +991,6 @@ virthba_queue_command_lck(struct scsi_cmnd *scsicmd, sgl = scsi_sglist(scsicmd); for_each_sg(sgl, sg, scsi_sg_count(scsicmd), i) { - cmdrsp-scsi.gpi_list[i].address = sg_phys(sg); cmdrsp-scsi.gpi_list[i].length = sg-length; if ((i != 0) (sg-offset != 0)) @@ -1207,7 +1208,6 @@ do_scsi_nolinuxstat(struct uiscmdrsp *cmdrsp, struct scsi_cmnd *scsicmd) bufind += sg[i].length; } } else { - vdisk = ((struct virthba_info *)scsidev-host-hostdata)-head; for ( ; vdisk-next; vdisk = vdisk-next) { if ((scsidev-channel != vdisk-channel) @@ -1323,7 +1323,6 @@ drain_queue(struct virthba_info *virthbainfo, struct chaninfo *dc, } } - /* main function for the thread that waits for scsi commands to arrive * in a specified queue */ @@ -1657,7 +1656,6 @@ virthba_mod_init(void) POSTCODE_LINUX_3(VHBA_CREATE_FAILURE_PC, error, POSTCODE_SEVERITY_ERR); } else { - /* create the debugfs directories and entries */ virthba_debugfs_dir = debugfs_create_dir(virthba, NULL); debugfs_create_file(info, S_IRUSR, virthba_debugfs_dir, @@ -1748,7 +1746,6 @@ virthba_mod_exit(void) debugfs_remove_recursive(virthba_debugfs_dir); LOGINF(Leaving virthba_mod_exit\n); - } /* specify function to be run at module insertion time */ -- 1.9.1 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel