Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f840afb authored by Dominik Brodowski's avatar Dominik Brodowski
Browse files

pcmcia: replace struct irq with uint pcmcia_irq in struct pcmcia_socket



As we don't need the "Config" counter any more, we can simplify
struct pcmcia_socket.

Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent 6f0f38c4
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ static int bfin_cf_get_status(struct pcmcia_socket *s, u_int *sp)

	if (bfin_cf_present(cf->cd_pfx)) {
		*sp = SS_READY | SS_DETECT | SS_POWERON | SS_3VCARD;
		s->irq.AssignedIRQ = 0;
		s->pcmcia_irq = 0;
		s->pci_irq = cf->irq;

	} else
+0 −1
Original line number Diff line number Diff line
@@ -94,7 +94,6 @@ int __ref cb_alloc(struct pcmcia_socket *s)
	pci_enable_bridges(bus);
	pci_bus_add_devices(bus);

	s->irq.AssignedIRQ = s->pci_irq;
	return 0;
}

+0 −1
Original line number Diff line number Diff line
@@ -337,7 +337,6 @@ static void socket_shutdown(struct pcmcia_socket *s)
	s->socket = dead_socket;
	s->ops->init(s);
	s->ops->set_socket(s, &s->socket);
	s->irq.AssignedIRQ = s->irq.Config = 0;
	s->lock_count = 0;
	kfree(s->fake_cis);
	s->fake_cis = NULL;
+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ static int omap_cf_get_status(struct pcmcia_socket *s, u_int *sp)

		*sp = SS_READY | SS_DETECT | SS_POWERON | SS_3VCARD;
		cf = container_of(s, struct omap_cf_socket, socket);
		s->irq.AssignedIRQ = 0;
		s->pcmcia_irq = 0;
		s->pci_irq = cf->irq;
	} else
		*sp = 0;
+2 −2
Original line number Diff line number Diff line
@@ -351,7 +351,7 @@ static int pccard_get_configuration_info(struct pcmcia_socket *s,
		if (s->state & SOCKET_CARDBUS_CONFIG) {
			config->Attributes = CONF_VALID_CLIENT;
			config->IntType = INT_CARDBUS;
			config->AssignedIRQ = s->irq.AssignedIRQ;
			config->AssignedIRQ = s->pcmcia_irq;
			if (config->AssignedIRQ)
				config->Attributes |= CONF_ENABLE_IRQ;
			if (s->io[0].res) {
@@ -391,7 +391,7 @@ static int pccard_get_configuration_info(struct pcmcia_socket *s,
	config->ExtStatus = c->ExtStatus;
	config->Present = config->CardValues = c->CardValues;
	config->IRQAttributes = c->irq.Attributes;
	config->AssignedIRQ = s->irq.AssignedIRQ;
	config->AssignedIRQ = s->pcmcia_irq;
	config->BasePort1 = c->io.BasePort1;
	config->NumPorts1 = c->io.NumPorts1;
	config->Attributes1 = c->io.Attributes1;
Loading