UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ata,scsi: remove ata_sas_port_init() 

ata_sas_port_init() now only contains a single initialization.

Move this single initialization to ata_sas_port_alloc(), since:
1) ata_sas_port_alloc() already initializes some of the struct members.
2) ata_sas_port_alloc() is only used by libsas.

Suggested-by: John Garry <john.g.garry@oracle.com>
Signed-off-by: Niklas Cassel <niklas.cassel@wdc.com>
Reviewed-by: John Garry <john.g.garry@oracle.com>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
This commit is contained in:
Niklas Cassel 2023-07-31 16:34:18 +02:00 committed by Damien Le Moal
parent a76f1b637c
commit 541528170a
3 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/ata/libata-sata.c
View File

@ -1139,29 +1139,12 @@ struct ata_port *ata_sas_port_alloc(struct ata_host *host,
ap->flags |= port_info->flags; ap->flags |= port_info->flags;
ap->ops = port_info->port_ops; ap->ops = port_info->port_ops;
ap->cbl = ATA_CBL_SATA; ap->cbl = ATA_CBL_SATA;
ap->print_id = atomic_inc_return(&ata_print_id);
return ap; return ap;
} }
EXPORT_SYMBOL_GPL(ata_sas_port_alloc); EXPORT_SYMBOL_GPL(ata_sas_port_alloc);
/**
* ata_sas_port_init - Initialize a SATA device
* @ap: SATA port to initialize
*
* LOCKING:
* PCI/etc. bus probe sem.
*
* RETURNS:
* Zero on success, non-zero on error.
*/
int ata_sas_port_init(struct ata_port *ap)
{
ap->print_id = atomic_inc_return(&ata_print_id);
return 0;
}
EXPORT_SYMBOL_GPL(ata_sas_port_init);
int ata_sas_tport_add(struct device *parent, struct ata_port *ap) int ata_sas_tport_add(struct device *parent, struct ata_port *ap)
{ {
return ata_tport_add(parent, ap); return ata_tport_add(parent, ap);

3
drivers/scsi/libsas/sas_ata.c
View File

@ -605,9 +605,6 @@ int sas_ata_init(struct domain_device *found_dev)
ap->private_data = found_dev; ap->private_data = found_dev;
ap->cbl = ATA_CBL_SATA; ap->cbl = ATA_CBL_SATA;
ap->scsi_host = shost; ap->scsi_host = shost;
rc = ata_sas_port_init(ap);
if (rc)
goto destroy_port;
rc = ata_sas_tport_add(ata_host->dev, ap); rc = ata_sas_tport_add(ata_host->dev, ap);
if (rc) if (rc)

1
include/linux/libata.h
View File

@ -1241,7 +1241,6 @@ extern int ata_slave_link_init(struct ata_port *ap);
extern struct ata_port *ata_sas_port_alloc(struct ata_host *, extern struct ata_port *ata_sas_port_alloc(struct ata_host *,
struct ata_port_info *, struct Scsi_Host *); struct ata_port_info *, struct Scsi_Host *);
extern void ata_port_probe(struct ata_port *ap); extern void ata_port_probe(struct ata_port *ap);
extern int ata_sas_port_init(struct ata_port *);
extern int ata_sas_tport_add(struct device *parent, struct ata_port *ap); extern int ata_sas_tport_add(struct device *parent, struct ata_port *ap);
extern void ata_sas_tport_delete(struct ata_port *ap); extern void ata_sas_tport_delete(struct ata_port *ap);
extern int ata_sas_slave_configure(struct scsi_device *, struct ata_port *); extern int ata_sas_slave_configure(struct scsi_device *, struct ata_port *);