projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag '5.2-rc-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6
[linux-2.6-microblaze.git]
/
drivers
/
mfd
/
ssbi.c
diff --git
a/drivers/mfd/ssbi.c
b/drivers/mfd/ssbi.c
index
36b96fe
..
0ae27cd
100644
(file)
--- a/
drivers/mfd/ssbi.c
+++ b/
drivers/mfd/ssbi.c
@@
-80,8
+80,6
@@
struct ssbi {
int (*write)(struct ssbi *, u16 addr, const u8 *buf, int len);
};
int (*write)(struct ssbi *, u16 addr, const u8 *buf, int len);
};
-#define to_ssbi(dev) platform_get_drvdata(to_platform_device(dev))
-
static inline u32 ssbi_readl(struct ssbi *ssbi, u32 reg)
{
return readl(ssbi->base + reg);
static inline u32 ssbi_readl(struct ssbi *ssbi, u32 reg)
{
return readl(ssbi->base + reg);
@@
-243,7
+241,7
@@
err:
int ssbi_read(struct device *dev, u16 addr, u8 *buf, int len)
{
int ssbi_read(struct device *dev, u16 addr, u8 *buf, int len)
{
- struct ssbi *ssbi =
to_ssbi
(dev);
+ struct ssbi *ssbi =
dev_get_drvdata
(dev);
unsigned long flags;
int ret;
unsigned long flags;
int ret;
@@
-257,7
+255,7
@@
EXPORT_SYMBOL_GPL(ssbi_read);
int ssbi_write(struct device *dev, u16 addr, const u8 *buf, int len)
{
int ssbi_write(struct device *dev, u16 addr, const u8 *buf, int len)
{
- struct ssbi *ssbi =
to_ssbi
(dev);
+ struct ssbi *ssbi =
dev_get_drvdata
(dev);
unsigned long flags;
int ret;
unsigned long flags;
int ret;