Skip to content

Commit f51b2db

Browse files
Merge patch series "Declare local functions static"
Bart Van Assche <[email protected]> says: Hi Martin, There are several 32-bit ARM SCSI drivers that trigger compiler warnings about missing function declarations. This patch series fixes these compiler warnings by declaring local functions static. Please consider this patch series for the next merge window. Thanks, Bart. Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Martin K. Petersen <[email protected]>
2 parents 5074f48 + daf6133 commit f51b2db

File tree

4 files changed

+7
-8
lines changed

4 files changed

+7
-8
lines changed

drivers/scsi/arm/acornscsi.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2450,7 +2450,7 @@ static int acornscsi_queuecmd_lck(struct scsi_cmnd *SCpnt)
24502450
return 0;
24512451
}
24522452

2453-
DEF_SCSI_QCMD(acornscsi_queuecmd)
2453+
static DEF_SCSI_QCMD(acornscsi_queuecmd)
24542454

24552455
enum res_abort { res_not_running, res_success, res_success_clear, res_snooze };
24562456

@@ -2552,7 +2552,7 @@ static enum res_abort acornscsi_do_abort(AS_Host *host, struct scsi_cmnd *SCpnt)
25522552
* Params : SCpnt - command to abort
25532553
* Returns : one of SCSI_ABORT_ macros
25542554
*/
2555-
int acornscsi_abort(struct scsi_cmnd *SCpnt)
2555+
static int acornscsi_abort(struct scsi_cmnd *SCpnt)
25562556
{
25572557
AS_Host *host = (AS_Host *) SCpnt->device->host->hostdata;
25582558
int result;
@@ -2634,7 +2634,7 @@ int acornscsi_abort(struct scsi_cmnd *SCpnt)
26342634
* Params : SCpnt - command causing reset
26352635
* Returns : one of SCSI_RESET_ macros
26362636
*/
2637-
int acornscsi_host_reset(struct scsi_cmnd *SCpnt)
2637+
static int acornscsi_host_reset(struct scsi_cmnd *SCpnt)
26382638
{
26392639
AS_Host *host = (AS_Host *)SCpnt->device->host->hostdata;
26402640
struct scsi_cmnd *SCptr;
@@ -2679,8 +2679,7 @@ int acornscsi_host_reset(struct scsi_cmnd *SCpnt)
26792679
* Params : host - host to give information on
26802680
* Returns : a constant string
26812681
*/
2682-
const
2683-
char *acornscsi_info(struct Scsi_Host *host)
2682+
static const char *acornscsi_info(struct Scsi_Host *host)
26842683
{
26852684
static char string[100], *p;
26862685

drivers/scsi/arm/cumana_2.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ cumanascsi_2_dma_stop(struct Scsi_Host *host, struct scsi_pointer *SCp)
296296
* Params : host - driver host structure to return info for.
297297
* Returns : pointer to a static buffer containing null terminated string.
298298
*/
299-
const char *cumanascsi_2_info(struct Scsi_Host *host)
299+
static const char *cumanascsi_2_info(struct Scsi_Host *host)
300300
{
301301
struct cumanascsi2_info *info = (struct cumanascsi2_info *)host->hostdata;
302302
static char string[150];

drivers/scsi/arm/eesox.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ eesoxscsi_dma_stop(struct Scsi_Host *host, struct scsi_pointer *SCp)
381381
* Params : host - driver host structure to return info for.
382382
* Returns : pointer to a static buffer containing null terminated string.
383383
*/
384-
const char *eesoxscsi_info(struct Scsi_Host *host)
384+
static const char *eesoxscsi_info(struct Scsi_Host *host)
385385
{
386386
struct eesoxscsi_info *info = (struct eesoxscsi_info *)host->hostdata;
387387
static char string[150];

drivers/scsi/arm/powertec.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ powertecscsi_dma_stop(struct Scsi_Host *host, struct scsi_pointer *SCp)
184184
* Params : host - driver host structure to return info for.
185185
* Returns : pointer to a static buffer containing null terminated string.
186186
*/
187-
const char *powertecscsi_info(struct Scsi_Host *host)
187+
static const char *powertecscsi_info(struct Scsi_Host *host)
188188
{
189189
struct powertec_info *info = (struct powertec_info *)host->hostdata;
190190
static char string[150];

0 commit comments

Comments
 (0)