Commit ae2dc032 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:
 "Just a few odd fixes and improvements to the PCMCIA core"

* 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux:
  pcmcia: remove unused dprintk definition
  pcmcia: include <pcmcia/ds.h> for pcmcia_parse_tuple
  pcmcia: include cs_internal.h for missing declarations
  pcmcia: Use dev_get_drvdata where possible
  pcmcia: clean an indentation issues, remove extraneous spaces
parents a86f69d3 bd9d6e03

drivers/pcmcia/cardbus.c

+2 −0
Original line number Diff line number Diff line
@@ -22,7 +22,9 @@ 
#include <linux/pci.h>



#include <pcmcia/ss.h>

#include <pcmcia/cistpl.h>



#include "cs_internal.h"



static void cardbus_config_irq_and_cls(struct pci_bus *bus, int irq)

{

drivers/pcmcia/cistpl.c

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <pcmcia/ss.h>

#include <pcmcia/cisreg.h>

#include <pcmcia/cistpl.h>

#include <pcmcia/ds.h>

#include "cs_internal.h"



static const u_char mantissa[] = {

drivers/pcmcia/i82092.c

+16 −18
Original line number Diff line number Diff line
@@ -440,7 +440,6 @@ static int i82092aa_get_status(struct pcmcia_socket *socket, u_int *value) 
			*value |= SS_BATDEAD;

		if (!(status & I365_CS_BVD2))

			*value |= SS_BATWARN;

	 		

	}

	 

	if (status & I365_CS_WRPROT)
@@ -452,7 +451,6 @@ static int i82092aa_get_status(struct pcmcia_socket *socket, u_int *value) 
	if (status & I365_CS_POWERON)

		(*value) |= SS_POWERON;  /* power is applied to the card */





	leave("i82092aa_get_status");

	return 0;

}

drivers/pcmcia/i82092aa.h

+0 −2
Original line number Diff line number Diff line
@@ -8,11 +8,9 @@ 
#ifdef NOTRACE

#define enter(x)   printk("Enter: %s, %s line %i\n",x,__FILE__,__LINE__)

#define leave(x)   printk("Leave: %s, %s line %i\n",x,__FILE__,__LINE__)

#define dprintk(fmt, args...) printk(fmt , ## args)

#else

#define enter(x)   do {} while (0)

#define leave(x)   do {} while (0)

#define dprintk(fmt, args...) do {} while (0)

#endif

drivers/pcmcia/yenta_socket.c

+1 −2
Original line number Diff line number Diff line
@@ -173,8 +173,7 @@ static void exca_writew(struct yenta_socket *socket, unsigned reg, u16 val) 


static ssize_t show_yenta_registers(struct device *yentadev, struct device_attribute *attr, char *buf)

{

	struct pci_dev *dev = to_pci_dev(yentadev);

	struct yenta_socket *socket = pci_get_drvdata(dev);

	struct yenta_socket *socket = dev_get_drvdata(yentadev);

	int offset = 0, i;



	offset = snprintf(buf, PAGE_SIZE, "CB registers:");

CRA Git | Maintained and supported by SUSTech CRA and CCSE