Signed-off-by: Gustavo Pimentel
---
drivers/misc/dw-xdata-pcie.c | 99 +---
1 file changed, 57 insertions(+), 42 deletions(-)
diff --git a/drivers/misc/dw-xdata-pcie.c b/drivers/misc/dw-xdata-pcie.c
index 43fdd35..011516b 100644
--- a/drivers/misc/dw-xdata-pcie.c
+++ b/drivers/misc/dw-xdata-pcie.c
@@ -21,19 +21,7 @@
#define DW_XDATA_EP_MEM_OFFSET 0x800
-struct dw_xdata_pcie_data {
- /* xData registers location */
- enum pci_barno rg_bar;
- off_t rg_off;
- size_t rg_sz;
-};
-
-static const struct dw_xdata_pcie_data snps_edda_data = {
- /* xData registers location */
- .rg_bar = BAR_0,
- .rg_off = 0x, /* 0 Kbytes */
- .rg_sz = 0x012c, /* 300 bytes */
-};
+static DEFINE_IDA(xdata_ida);
#define STATUS_DONEBIT(0)
@@ -71,7 +59,6 @@ struct dw_xdata_regs {
struct dw_xdata_region {
phys_addr_t paddr; /* physical address */
void __iomem *vaddr;/* virtual address */
- size_t sz; /* size */
};
struct dw_xdata {
@@ -80,7 +67,6 @@ struct dw_xdata {
size_t max_rd_len; /* max rd xfer len */
struct mutex mutex;
struct pci_dev *pdev;
- struct device *dev;
struct miscdevice misc_dev;
};
@@ -107,6 +93,7 @@ static void dw_xdata_stop(struct dw_xdata *dw)
static void dw_xdata_start(struct dw_xdata *dw, bool write)
{
+ struct device *dev = >pdev->dev;
u32 control, status;
/* Stop first if xfer in progress */
@@ -144,7 +131,7 @@ static void dw_xdata_start(struct dw_xdata *dw, bool write)
mutex_unlock(>mutex);
if (!(status & STATUS_DONE))
- pci_dbg(dw->pdev, "xData: started %s direction\n",
+ dev_dbg(dev, "xData: started %s direction\n",
write ? "write" : "read");
}
@@ -174,6 +161,7 @@ static u64 dw_xdata_perf_diff(u64 *m1, u64 *m2, u64 time)
static void dw_xdata_perf(struct dw_xdata *dw, u64 *rate, bool write)
{
+ struct device *dev = >pdev->dev;
u64 data[2], time[2], diff;
mutex_lock(>mutex);
@@ -206,7 +194,7 @@ static void dw_xdata_perf(struct dw_xdata *dw, u64 *rate,
bool write)
mutex_unlock(>mutex);
- pci_dbg(dw->pdev, "xData: time=%llu us, %s=%llu MB/s\n",
+ dev_dbg(dev, "xData: time=%llu us, %s=%llu MB/s\n",
diff, write ? "write" : "read", *rate);
}
@@ -233,7 +221,7 @@ static ssize_t write_store(struct device *dev, struct
device_attribute *attr,
struct miscdevice *misc_dev = dev_get_drvdata(dev);
struct dw_xdata *dw = misc_dev_to_dw(misc_dev);
- pci_dbg(dw->pdev, "xData: requested write transfer\n");
+ dev_dbg(dev, "xData: requested write transfer\n");
dw_xdata_start(dw, true);
@@ -260,7 +248,7 @@ static ssize_t read_store(struct device *dev, struct
device_attribute *attr,
struct miscdevice *misc_dev = dev_get_drvdata(dev);
struct dw_xdata *dw = misc_dev_to_dw(misc_dev);
- pci_dbg(dw->pdev, "xData: requested read transfer\n");
+ dev_dbg(dev, "xData: requested read transfer\n");
dw_xdata_start(dw, false);
@@ -275,7 +263,7 @@ static ssize_t stop_store(struct device *dev, struct
device_attribute *attr,
struct miscdevice *misc_dev = dev_get_drvdata(dev);
struct dw_xdata *dw = misc_dev_to_dw(misc_dev);
- pci_dbg(dw->pdev, "xData: requested stop any transfer\n");
+ dev_dbg(dev, "xData: requested stop any transfer\n");
dw_xdata_stop(dw);
@@ -296,43 +284,42 @@ ATTRIBUTE_GROUPS(xdata);
static int dw_xdata_pcie_probe(struct pci_dev *pdev,
const struct pci_device_id *pid)
{
- const struct dw_xdata_pcie_data *pdata = (void *)pid->driver_data;
+ struct device *dev = >dev;
struct dw_xdata *dw;
+ char name[24];
u64 addr;
int err;
+ int id;
/* Enable PCI device */
err = pcim_enable_device(pdev);
if (err) {
- pci_err(pdev, "enabling device failed\n");
+ dev_err(dev, "enabling device failed\n");
return err;
}
/* Mapping PCI BAR regions */
- err = pcim_iomap_regions(pdev, BIT(pdata->rg_bar), pci_name(pdev));
+ err = pcim_iomap_regions(pdev, BIT(BAR_0), pci_name(pdev));
if (err) {
- pci_err(pdev, "xData BAR I/O remapping failed\n");
+ dev_err(dev, "xData BAR I/O remapping failed\n");
return err;
}
pci_set_master(pdev);
/* Allocate memory */
- dw = devm_kzalloc(>dev, sizeof(*dw), GFP_KERNEL);
+ dw =