Commit 54152817 authored by Niklas Cassel's avatar Niklas Cassel Committed by Damien Le Moal
Browse files

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: default avatarJohn Garry <john.g.garry@oracle.com>
Signed-off-by: default avatarNiklas Cassel <niklas.cassel@wdc.com>
Reviewed-by: default avatarJohn Garry <john.g.garry@oracle.com>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarDamien Le Moal <dlemoal@kernel.org>
parent a76f1b63

drivers/ata/libata-sata.c

+1 −18
Original line number Diff line number Diff line
@@ -1139,29 +1139,12 @@ struct ata_port *ata_sas_port_alloc(struct ata_host *host, 
	ap->flags |= port_info->flags;

	ap->ops = port_info->port_ops;

	ap->cbl = ATA_CBL_SATA;

	ap->print_id = atomic_inc_return(&ata_print_id);



	return ap;

}

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)

{

	return ata_tport_add(parent, ap);

drivers/scsi/libsas/sas_ata.c

+0 −3
Original line number Diff line number Diff line
@@ -605,9 +605,6 @@ int sas_ata_init(struct domain_device *found_dev) 
	ap->private_data = found_dev;

	ap->cbl = ATA_CBL_SATA;

	ap->scsi_host = shost;

	rc = ata_sas_port_init(ap);

	if (rc)

		goto destroy_port;



	rc = ata_sas_tport_add(ata_host->dev, ap);

	if (rc)

include/linux/libata.h

+0 −1
Original line number Diff line number Diff line
@@ -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 *,

					   struct ata_port_info *, struct Scsi_Host *);

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 void ata_sas_tport_delete(struct ata_port *ap);

extern int ata_sas_slave_configure(struct scsi_device *, struct ata_port *);