git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nfsd4: setclientid_confirm callback-change fixes
[safe/jmp/linux-2.6]
/
drivers
/
spi
/
omap_uwire.c
diff --git
a/drivers/spi/omap_uwire.c
b/drivers/spi/omap_uwire.c
index
394b616
..
fe8b9ac
100644
(file)
--- a/
drivers/spi/omap_uwire.c
+++ b/
drivers/spi/omap_uwire.c
@@
-245,7
+245,7
@@
static int uwire_txrx(struct spi_device *spi, struct spi_transfer *t)
#ifdef VERBOSE
pr_debug("%s: write-%d =%04x\n",
#ifdef VERBOSE
pr_debug("%s: write-%d =%04x\n",
-
spi->dev.bus_id
, bits, val);
+
dev_name(&spi->dev)
, bits, val);
#endif
if (wait_uwire_csr_flag(CSRB, 0, 0))
goto eio;
#endif
if (wait_uwire_csr_flag(CSRB, 0, 0))
goto eio;
@@
-305,7
+305,7
@@
static int uwire_txrx(struct spi_device *spi, struct spi_transfer *t)
status += bytes;
#ifdef VERBOSE
pr_debug("%s: read-%d =%04x\n",
status += bytes;
#ifdef VERBOSE
pr_debug("%s: read-%d =%04x\n",
-
spi->dev.bus_id
, bits, val);
+
dev_name(&spi->dev)
, bits, val);
#endif
}
#endif
}
@@
-331,7
+331,7
@@
static int uwire_setup_transfer(struct spi_device *spi, struct spi_transfer *t)
uwire = spi_master_get_devdata(spi->master);
if (spi->chip_select > 3) {
uwire = spi_master_get_devdata(spi->master);
if (spi->chip_select > 3) {
- pr_debug("%s: cs%d?\n",
spi->dev.bus_id
, spi->chip_select);
+ pr_debug("%s: cs%d?\n",
dev_name(&spi->dev)
, spi->chip_select);
status = -ENODEV;
goto done;
}
status = -ENODEV;
goto done;
}
@@
-343,7
+343,7
@@
static int uwire_setup_transfer(struct spi_device *spi, struct spi_transfer *t)
bits = 8;
if (bits > 16) {
bits = 8;
if (bits > 16) {
- pr_debug("%s: wordsize %d?\n",
spi->dev.bus_id
, bits);
+ pr_debug("%s: wordsize %d?\n",
dev_name(&spi->dev)
, bits);
status = -ENODEV;
goto done;
}
status = -ENODEV;
goto done;
}
@@
-378,7
+378,7
@@
static int uwire_setup_transfer(struct spi_device *spi, struct spi_transfer *t)
hz = t->speed_hz;
if (!hz) {
hz = t->speed_hz;
if (!hz) {
- pr_debug("%s: zero speed?\n",
spi->dev.bus_id
);
+ pr_debug("%s: zero speed?\n",
dev_name(&spi->dev)
);
status = -EINVAL;
goto done;
}
status = -EINVAL;
goto done;
}
@@
-406,7
+406,7
@@
static int uwire_setup_transfer(struct spi_device *spi, struct spi_transfer *t)
}
if (div1_idx == 4) {
pr_debug("%s: lowest clock %ld, need %d\n",
}
if (div1_idx == 4) {
pr_debug("%s: lowest clock %ld, need %d\n",
-
spi->dev.bus_id
, rate / 10 / 8, hz);
+
dev_name(&spi->dev)
, rate / 10 / 8, hz);
status = -EDOM;
goto done;
}
status = -EDOM;
goto done;
}