Commit ae2dc032 authored by Linus Torvalds's avatar Linus Torvalds

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
...@@ -22,7 +22,9 @@ ...@@ -22,7 +22,9 @@
#include <linux/pci.h> #include <linux/pci.h>
#include <pcmcia/ss.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) static void cardbus_config_irq_and_cls(struct pci_bus *bus, int irq)
{ {
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include <pcmcia/ss.h> #include <pcmcia/ss.h>
#include <pcmcia/cisreg.h> #include <pcmcia/cisreg.h>
#include <pcmcia/cistpl.h> #include <pcmcia/cistpl.h>
#include <pcmcia/ds.h>
#include "cs_internal.h" #include "cs_internal.h"
static const u_char mantissa[] = { static const u_char mantissa[] = {
......
...@@ -431,27 +431,25 @@ static int i82092aa_get_status(struct pcmcia_socket *socket, u_int *value) ...@@ -431,27 +431,25 @@ static int i82092aa_get_status(struct pcmcia_socket *socket, u_int *value)
/* IO cards have a different meaning of bits 0,1 */ /* IO cards have a different meaning of bits 0,1 */
/* Also notice the inverse-logic on the bits */ /* Also notice the inverse-logic on the bits */
if (indirect_read(sock, I365_INTCTL) & I365_PC_IOCARD) { if (indirect_read(sock, I365_INTCTL) & I365_PC_IOCARD) {
/* IO card */ /* IO card */
if (!(status & I365_CS_STSCHG)) if (!(status & I365_CS_STSCHG))
*value |= SS_STSCHG; *value |= SS_STSCHG;
} else { /* non I/O card */ } else { /* non I/O card */
if (!(status & I365_CS_BVD1)) if (!(status & I365_CS_BVD1))
*value |= SS_BATDEAD; *value |= SS_BATDEAD;
if (!(status & I365_CS_BVD2)) if (!(status & I365_CS_BVD2))
*value |= SS_BATWARN; *value |= SS_BATWARN;
}
}
if (status & I365_CS_WRPROT) if (status & I365_CS_WRPROT)
(*value) |= SS_WRPROT; /* card is write protected */ (*value) |= SS_WRPROT; /* card is write protected */
if (status & I365_CS_READY) if (status & I365_CS_READY)
(*value) |= SS_READY; /* card is not busy */ (*value) |= SS_READY; /* card is not busy */
if (status & I365_CS_POWERON) if (status & I365_CS_POWERON)
(*value) |= SS_POWERON; /* power is applied to the card */ (*value) |= SS_POWERON; /* power is applied to the card */
leave("i82092aa_get_status"); leave("i82092aa_get_status");
return 0; return 0;
......
...@@ -8,11 +8,9 @@ ...@@ -8,11 +8,9 @@
#ifdef NOTRACE #ifdef NOTRACE
#define enter(x) printk("Enter: %s, %s line %i\n",x,__FILE__,__LINE__) #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 leave(x) printk("Leave: %s, %s line %i\n",x,__FILE__,__LINE__)
#define dprintk(fmt, args...) printk(fmt , ## args)
#else #else
#define enter(x) do {} while (0) #define enter(x) do {} while (0)
#define leave(x) do {} while (0) #define leave(x) do {} while (0)
#define dprintk(fmt, args...) do {} while (0)
#endif #endif
......
...@@ -173,8 +173,7 @@ static void exca_writew(struct yenta_socket *socket, unsigned reg, u16 val) ...@@ -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) 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 = dev_get_drvdata(yentadev);
struct yenta_socket *socket = pci_get_drvdata(dev);
int offset = 0, i; int offset = 0, i;
offset = snprintf(buf, PAGE_SIZE, "CB registers:"); offset = snprintf(buf, PAGE_SIZE, "CB registers:");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment