Commit 651283d5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux 

Pull pcmcia updates from Dominik Brodowski:
 "Besides a few PCMCIA odd fixes, the NEC VRC4173 CARDU driver is
  removed, as it has not compiled in ages"

* 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux:
  pcmcia: omap: Fix error return code in omap_cf_probe()
  pcmcia: Remove NEC VRC4173 CARDU
  pcmcia: db1xxx_ss: remove unneeded semicolon
  pcmcia/electra_cf: Fix some return values in 'electra_cf_probe()' in case of error
parents 190daf19 70d3a462

drivers/pcmcia/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -244,10 +244,6 @@ config PCMCIA_VRC4171 
	tristate "NEC VRC4171 Card Controllers support"

	depends on CPU_VR41XX && ISA && PCMCIA



config PCMCIA_VRC4173

	tristate "NEC VRC4173 CARDU support"

	depends on CPU_VR41XX && PCI && PCMCIA



config OMAP_CF

	tristate "OMAP CompactFlash Controller"

	depends on PCMCIA && ARCH_OMAP16XX

drivers/pcmcia/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ obj-$(CONFIG_PCMCIA_SA1100) += sa1100_cs.o 
obj-$(CONFIG_PCMCIA_SA1111)			+= sa1111_cs.o

obj-$(CONFIG_PCMCIA_BCM63XX)			+= bcm63xx_pcmcia.o

obj-$(CONFIG_PCMCIA_VRC4171)			+= vrc4171_card.o

obj-$(CONFIG_PCMCIA_VRC4173)			+= vrc4173_cardu.o

obj-$(CONFIG_OMAP_CF)				+= omap_cf.o

obj-$(CONFIG_AT91_CF)				+= at91_cf.o

obj-$(CONFIG_ELECTRA_CF)			+= electra_cf.o

drivers/pcmcia/db1xxx_ss.c

+1 −1
Original line number Diff line number Diff line
@@ -452,7 +452,7 @@ static int db1x_pcmcia_socket_probe(struct platform_device *pdev) 
		printk(KERN_INFO "db1xxx-ss: unknown board %d!\n", bid);

		ret = -ENODEV;

		goto out0;

	};

	}



	/*

	 * gather resources necessary and optional nice-to-haves to

drivers/pcmcia/electra_cf.c

+2 −0
Original line number Diff line number Diff line
@@ -229,6 +229,8 @@ static int electra_cf_probe(struct platform_device *ofdev) 


	cf->socket.pci_irq = cf->irq;



	status = -EINVAL;



	prop = of_get_property(np, "card-detect-gpio", NULL);

	if (!prop)

		goto fail1;

drivers/pcmcia/omap_cf.c

+6 −2
Original line number Diff line number Diff line
@@ -252,11 +252,15 @@ static int __init omap_cf_probe(struct platform_device *pdev) 
	/* pcmcia layer only remaps "real" memory */

	cf->socket.io_offset = (unsigned long)

			ioremap(cf->phys_cf + SZ_4K, SZ_2K);

	if (!cf->socket.io_offset)

	if (!cf->socket.io_offset) {

		status = -ENOMEM;

		goto fail1;

	}



	if (!request_mem_region(cf->phys_cf, SZ_8K, driver_name))

	if (!request_mem_region(cf->phys_cf, SZ_8K, driver_name)) {

		status = -ENXIO;

		goto fail1;

	}



	/* NOTE:  CF conflicts with MMC1 */

	omap_cfg_reg(W11_1610_CF_CD1);

CRA Git | Maintained and supported by SUSTech CRA and CCSE