|
@@ -103,12 +103,12 @@ struct ds1wm_data {
|
|
static inline void ds1wm_write_register(struct ds1wm_data *ds1wm_data, u32 reg,
|
|
static inline void ds1wm_write_register(struct ds1wm_data *ds1wm_data, u32 reg,
|
|
u8 val)
|
|
u8 val)
|
|
{
|
|
{
|
|
- __raw_writeb(val, ds1wm_data->map + (reg << ds1wm_data->bus_shift));
|
|
|
|
|
|
+ __raw_writeb(val, ds1wm_data->map + (reg << ds1wm_data->bus_shift));
|
|
}
|
|
}
|
|
|
|
|
|
static inline u8 ds1wm_read_register(struct ds1wm_data *ds1wm_data, u32 reg)
|
|
static inline u8 ds1wm_read_register(struct ds1wm_data *ds1wm_data, u32 reg)
|
|
{
|
|
{
|
|
- return __raw_readb(ds1wm_data->map + (reg << ds1wm_data->bus_shift));
|
|
|
|
|
|
+ return __raw_readb(ds1wm_data->map + (reg << ds1wm_data->bus_shift));
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
@@ -150,8 +150,8 @@ static int ds1wm_reset(struct ds1wm_data *ds1wm_data)
|
|
timeleft = wait_for_completion_timeout(&reset_done, DS1WM_TIMEOUT);
|
|
timeleft = wait_for_completion_timeout(&reset_done, DS1WM_TIMEOUT);
|
|
ds1wm_data->reset_complete = NULL;
|
|
ds1wm_data->reset_complete = NULL;
|
|
if (!timeleft) {
|
|
if (!timeleft) {
|
|
- dev_dbg(&ds1wm_data->pdev->dev, "reset failed\n");
|
|
|
|
- return 1;
|
|
|
|
|
|
+ dev_err(&ds1wm_data->pdev->dev, "reset failed\n");
|
|
|
|
+ return 1;
|
|
}
|
|
}
|
|
|
|
|
|
/* Wait for the end of the reset. According to the specs, the time
|
|
/* Wait for the end of the reset. According to the specs, the time
|
|
@@ -168,11 +168,11 @@ static int ds1wm_reset(struct ds1wm_data *ds1wm_data)
|
|
(ds1wm_data->active_high ? DS1WM_INTEN_IAS : 0));
|
|
(ds1wm_data->active_high ? DS1WM_INTEN_IAS : 0));
|
|
|
|
|
|
if (!ds1wm_data->slave_present) {
|
|
if (!ds1wm_data->slave_present) {
|
|
- dev_dbg(&ds1wm_data->pdev->dev, "reset: no devices found\n");
|
|
|
|
- return 1;
|
|
|
|
- }
|
|
|
|
|
|
+ dev_dbg(&ds1wm_data->pdev->dev, "reset: no devices found\n");
|
|
|
|
+ return 1;
|
|
|
|
+ }
|
|
|
|
|
|
- return 0;
|
|
|
|
|
|
+ return 0;
|
|
}
|
|
}
|
|
|
|
|
|
static int ds1wm_write(struct ds1wm_data *ds1wm_data, u8 data)
|
|
static int ds1wm_write(struct ds1wm_data *ds1wm_data, u8 data)
|
|
@@ -335,7 +335,7 @@ static int ds1wm_probe(struct platform_device *pdev)
|
|
if (!pdev)
|
|
if (!pdev)
|
|
return -ENODEV;
|
|
return -ENODEV;
|
|
|
|
|
|
- ds1wm_data = kzalloc(sizeof (*ds1wm_data), GFP_KERNEL);
|
|
|
|
|
|
+ ds1wm_data = kzalloc(sizeof(*ds1wm_data), GFP_KERNEL);
|
|
if (!ds1wm_data)
|
|
if (!ds1wm_data)
|
|
return -ENOMEM;
|
|
return -ENOMEM;
|
|
|
|
|