Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 268815
b: refs/heads/master
c: 8122fa3
h: refs/heads/master
i:
  268813: 986231b
  268811: 99f446d
  268807: 42d6fc6
  268799: e3ba49f
v: v3
  • Loading branch information
Pelle Windestam authored and Greg Kroah-Hartman committed Oct 17, 2011
1 parent 8782a27 commit c190d91
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 34 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b6fbd29c8b836246169296869c3103ccecc201ad
refs/heads/master: 8122fa341d36ecacd2bc9e1b0f62594f8130b5ad
62 changes: 34 additions & 28 deletions trunk/drivers/staging/rts_pstor/rtsx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
#include "sd.h"
#include "xd.h"

#define DRIVER_VERSION "v1.10"
#define DRIVER_VERSION "v1.10"

MODULE_DESCRIPTION("Realtek PCI-Express card reader driver");
MODULE_LICENSE("GPL");
Expand Down Expand Up @@ -77,7 +77,7 @@ static const char *host_info(struct Scsi_Host *host)
return "SCSI emulation for PCI-Express Mass Storage devices";
}

static int slave_alloc (struct scsi_device *sdev)
static int slave_alloc(struct scsi_device *sdev)
{
/*
* Set the INQUIRY transfer length to 36. We don't use any of
Expand Down Expand Up @@ -130,7 +130,7 @@ static int slave_configure(struct scsi_device *sdev)
#define SPRINTF(args...) \
do { if (pos < buffer+length) pos += sprintf(pos, ## args); } while (0)

static int proc_info (struct Scsi_Host *host, char *buffer,
static int proc_info(struct Scsi_Host *host, char *buffer,
char **start, off_t offset, int length, int inout)
{
char *pos = buffer;
Expand Down Expand Up @@ -506,13 +506,15 @@ static int rtsx_control_thread(void *__dev)
*/
else if (chip->srb->device->id) {
printk(KERN_ERR "Bad target number (%d:%d)\n",
chip->srb->device->id, chip->srb->device->lun);
chip->srb->device->id,
chip->srb->device->lun);
chip->srb->result = DID_BAD_TARGET << 16;
}

else if (chip->srb->device->lun > chip->max_lun) {
printk(KERN_ERR "Bad LUN (%d:%d)\n",
chip->srb->device->id, chip->srb->device->lun);
chip->srb->device->id,
chip->srb->device->lun);
chip->srb->result = DID_BAD_TARGET << 16;
}

Expand Down Expand Up @@ -625,26 +627,23 @@ static irqreturn_t rtsx_interrupt(int irq, void *dev_id)
int retval;
u32 status;

if (dev) {
if (dev)
chip = dev->chip;
} else {
else
return IRQ_NONE;
}

if (!chip) {
if (!chip)
return IRQ_NONE;
}

spin_lock(&dev->reg_lock);

retval = rtsx_pre_handle_interrupt(chip);
if (retval == STATUS_FAIL) {
spin_unlock(&dev->reg_lock);
if (chip->int_reg == 0xFFFFFFFF) {
if (chip->int_reg == 0xFFFFFFFF)
return IRQ_HANDLED;
} else {
else
return IRQ_NONE;
}
}

status = chip->int_reg;
Expand All @@ -661,9 +660,8 @@ static irqreturn_t rtsx_interrupt(int irq, void *dev_id)

if (status & (NEED_COMPLETE_INT | DELINK_INT)) {
if (status & (TRANS_FAIL_INT | DELINK_INT)) {
if (status & DELINK_INT) {
if (status & DELINK_INT)
RTSX_SET_DELINK(chip);
}
dev->trans_result = TRANS_RESULT_FAIL;
if (dev->done)
complete(dev->done);
Expand Down Expand Up @@ -844,7 +842,9 @@ static void rtsx_init_options(struct rtsx_chip *chip)
chip->ssc_en = 1;
chip->sd_speed_prior = 0x01040203;
chip->sd_current_prior = 0x00010203;
chip->sd_ctl = SD_PUSH_POINT_AUTO | SD_SAMPLE_POINT_AUTO | SUPPORT_MMC_DDR_MODE;
chip->sd_ctl = SD_PUSH_POINT_AUTO |
SD_SAMPLE_POINT_AUTO |
SUPPORT_MMC_DDR_MODE;
chip->sd_ddr_tx_phase = 0;
chip->mmc_ddr_tx_phase = 1;
chip->sd_default_tx_phase = 15;
Expand Down Expand Up @@ -896,7 +896,8 @@ static void rtsx_init_options(struct rtsx_chip *chip)
chip->s3_pwr_off_delay = 1000;
}

static int __devinit rtsx_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
static int __devinit rtsx_probe(struct pci_dev *pci,
const struct pci_device_id *pci_id)
{
struct Scsi_Host *host;
struct rtsx_dev *dev;
Expand All @@ -913,7 +914,8 @@ static int __devinit rtsx_probe(struct pci_dev *pci, const struct pci_device_id

err = pci_request_regions(pci, CR_DRIVER_NAME);
if (err < 0) {
printk(KERN_ERR "PCI request regions for %s failed!\n", CR_DRIVER_NAME);
printk(KERN_ERR "PCI request regions for %s failed!\n",
CR_DRIVER_NAME);
pci_disable_device(pci);
return err;
}
Expand All @@ -934,9 +936,8 @@ static int __devinit rtsx_probe(struct pci_dev *pci, const struct pci_device_id
memset(dev, 0, sizeof(struct rtsx_dev));

dev->chip = kzalloc(sizeof(struct rtsx_chip), GFP_KERNEL);
if (dev->chip == NULL) {
if (dev->chip == NULL)
goto errout;
}

spin_lock_init(&dev->reg_lock);
mutex_init(&(dev->dev_mutex));
Expand All @@ -950,7 +951,8 @@ static int __devinit rtsx_probe(struct pci_dev *pci, const struct pci_device_id
dev->pci = pci;
dev->irq = -1;

printk(KERN_INFO "Resource length: 0x%x\n", (unsigned int)pci_resource_len(pci, 0));
printk(KERN_INFO "Resource length: 0x%x\n",
(unsigned int)pci_resource_len(pci, 0));
dev->addr = pci_resource_start(pci, 0);
dev->remap_addr = ioremap_nocache(dev->addr, pci_resource_len(pci, 0));
if (dev->remap_addr == NULL) {
Expand All @@ -959,9 +961,12 @@ static int __devinit rtsx_probe(struct pci_dev *pci, const struct pci_device_id
goto errout;
}

/* Using "unsigned long" cast here to eliminate gcc warning in 64-bit system */
/*
* Using "unsigned long" cast here to eliminate gcc warning in
* 64-bit system
*/
printk(KERN_INFO "Original address: 0x%lx, remapped address: 0x%lx\n",
(unsigned long)(dev->addr), (unsigned long)(dev->remap_addr));
(unsigned long)(dev->addr), (unsigned long)(dev->remap_addr));

dev->rtsx_resv_buf = dma_alloc_coherent(&(pci->dev), RTSX_RESV_BUF_LEN,
&(dev->rtsx_resv_buf_addr), GFP_KERNEL);
Expand All @@ -973,7 +978,8 @@ static int __devinit rtsx_probe(struct pci_dev *pci, const struct pci_device_id
dev->chip->host_cmds_ptr = dev->rtsx_resv_buf;
dev->chip->host_cmds_addr = dev->rtsx_resv_buf_addr;
dev->chip->host_sg_tbl_ptr = dev->rtsx_resv_buf + HOST_CMDS_BUF_LEN;
dev->chip->host_sg_tbl_addr = dev->rtsx_resv_buf_addr + HOST_CMDS_BUF_LEN;
dev->chip->host_sg_tbl_addr = dev->rtsx_resv_buf_addr +
HOST_CMDS_BUF_LEN;

dev->chip->rtsx = dev;

Expand Down Expand Up @@ -1058,10 +1064,10 @@ static void __devexit rtsx_remove(struct pci_dev *pci)
}

/* PCI IDs */
static struct pci_device_id rtsx_ids[] = {
{ 0x10EC, 0x5208, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_OTHERS << 16, 0xFF0000 },
{ 0x10EC, 0x5209, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_OTHERS << 16, 0xFF0000 },
{ 0x10EC, 0x5288, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_OTHERS << 16, 0xFF0000 },
static DEFINE_PCI_DEVICE_TABLE(rtsx_ids) = {
{ PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x5208), PCI_CLASS_OTHERS << 16, 0xFF0000 },
{ PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x5209), PCI_CLASS_OTHERS << 16, 0xFF0000 },
{ PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x5288), PCI_CLASS_OTHERS << 16, 0xFF0000 },
{ 0, },
};

Expand Down
10 changes: 5 additions & 5 deletions trunk/drivers/staging/rts_pstor/rtsx.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
#ifndef __REALTEK_RTSX_H
#define __REALTEK_RTSX_H

#include <asm/io.h>
#include <asm/bitops.h>
#include <linux/io.h>
#include <linux/bitops.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
#include <linux/kernel.h>
Expand Down Expand Up @@ -80,7 +80,7 @@

#define wait_timeout_x(task_state, msecs) \
do { \
set_current_state((task_state)); \
set_current_state((task_state)); \
schedule_timeout((msecs) * HZ / 1000); \
} while (0)
#define wait_timeout(msecs) wait_timeout_x(TASK_INTERRUPTIBLE, (msecs))
Expand All @@ -102,12 +102,12 @@ typedef unsigned long DELAY_PARA_T;
struct rtsx_chip;

struct rtsx_dev {
struct pci_dev *pci;
struct pci_dev *pci;

/* pci resources */
unsigned long addr;
void __iomem *remap_addr;
int irq;
int irq;

/* locks */
spinlock_t reg_lock;
Expand Down

0 comments on commit c190d91

Please sign in to comment.