Commit 1dd63a6b authored by Niklas Cassel's avatar Niklas Cassel
Browse files

ata: libata-core: Remove local_port_no struct member 



ap->local_port_no is simply ap->port_no + 1.
Since ap->local_port_no can be derived from ap->port_no, there is no need
for the ap->local_port_no struct member, so remove ap->local_port_no.

Reviewed-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Link: https://lore.kernel.org/r/20240703184418.723066-16-cassel@kernel.org


Signed-off-by: default avatarNiklas Cassel <cassel@kernel.org>
parent 6933eb8e

drivers/ata/libata-core.c

+1 −4
Original line number Diff line number Diff line
@@ -5471,7 +5471,6 @@ struct ata_port *ata_port_alloc(struct ata_host *host) 
	ap->pflags |= ATA_PFLAG_INITIALIZING | ATA_PFLAG_FROZEN;

	ap->lock = &host->lock;

	ap->print_id = -1;

	ap->local_port_no = -1;

	ap->host = host;

	ap->dev = host->dev;
@@ -5909,10 +5908,8 @@ int ata_host_register(struct ata_host *host, const struct scsi_host_template *sh 
	}



	/* give ports names and add SCSI hosts */

	for (i = 0; i < host->n_ports; i++) {

	for (i = 0; i < host->n_ports; i++)

		host->ports[i]->print_id = atomic_inc_return(&ata_print_id);

		host->ports[i]->local_port_no = i + 1;

	}



	/* Create associated sysfs transport objects  */

	for (i = 0; i < host->n_ports; i++) {

drivers/ata/libata-transport.c

+2 −1
Original line number Diff line number Diff line
@@ -217,7 +217,8 @@ static DEVICE_ATTR(name, S_IRUGO, show_ata_port_##name, NULL) 


ata_port_simple_attr(nr_pmp_links, nr_pmp_links, "%d\n", int);

ata_port_simple_attr(stats.idle_irq, idle_irq, "%ld\n", unsigned long);

ata_port_simple_attr(local_port_no, port_no, "%u\n", unsigned int);

/* We want the port_no sysfs attibute to start at 1 (ap->port_no starts at 0) */

ata_port_simple_attr(port_no + 1, port_no, "%u\n", unsigned int);



static DECLARE_TRANSPORT_CLASS(ata_port_class,

			       "ata_port", NULL, NULL, NULL);

include/linux/libata.h

+0 −1
Original line number Diff line number Diff line
@@ -814,7 +814,6 @@ struct ata_port { 
	/* Flags that change dynamically, protected by ap->lock */

	unsigned int		pflags; /* ATA_PFLAG_xxx */

	unsigned int		print_id; /* user visible unique port ID */

	unsigned int            local_port_no; /* host local port num */

	unsigned int		port_no; /* 0 based port no. inside the host */



#ifdef CONFIG_ATA_SFF