ds1wm: simplify platform_data
PATCH 1/2 ds1wm: simplify platform_data
Simplify ds1wm's platform_data by using IORESOURCE_IRQ_* flags rather than the platform_data field active_high.
Signed-off-by Matt Reimer <[email protected]>
--- drivers/w1/masters/ds1wm.c | 11 +++++++---- include/linux/ds1wm.h | 1 - 2 files changed, 7 insertions(+), 5 deletions(-)
drivers/w1/masters/ds1wm.c +7 -4
@@ -90,6 +90,7 @@ struct ds1wm_data {struct platform_device *pdev;struct ds1wm_platform_data *pdata;int irq; +int active_high;struct clk *clk;int slave_present;void *reset_complete;
@@ -141,7 +142,7 @@ static int ds1wm_reset(struct ds1wm_data *ds1wm_data) ds1wm_data->reset_complete = &reset_done;ds1wm_write_register (ds1wm_data,DS1WM_INT_EN ,DS1WM_INTEN_EPD | - (ds1wm_data->pdata->active_high ?DS1WM_INTEN_IAS :0 )); + (ds1wm_data->active_high ?DS1WM_INTEN_IAS :0 ));ds1wm_write_register (ds1wm_data,DS1WM_CMD ,DS1WM_CMD_1W_RESET );
@@ -163,7 +164,7 @@ static int ds1wm_reset(struct ds1wm_data *ds1wm_data)ds1wm_write_register (ds1wm_data,DS1WM_INT_EN ,DS1WM_INTEN_ERBF |DS1WM_INTEN_ETMT |DS1WM_INTEN_EPD | - (ds1wm_data->pdata->active_high ?DS1WM_INTEN_IAS :0 )); + (ds1wm_data->active_high ?DS1WM_INTEN_IAS :0 ));if (!ds1wm_data->slave_present) {dev_dbg (&ds1wm_data->pdev->dev,"reset: no devices found\n" );
@@ -356,9 +357,11 @@ static int ds1wm_probe(struct platform_device *pdev) goto err1; } ds1wm_data->irq = res->start; + ds1wm_data->active_high = (res->flags &IORESOURCE_IRQ_HIGHEDGE ) ? +1 :0 ; -set_irq_type (ds1wm_data->irq, res->flags &IORESOURCE_IRQ_LOWEDGE ? -IRQ_TYPE_EDGE_FALLING :IRQ_TYPE_EDGE_RISING ); +set_irq_type (ds1wm_data->irq, ds1wm_data->active_high ? +IRQ_TYPE_EDGE_RISING :IRQ_TYPE_EDGE_FALLING ); ret =request_irq (ds1wm_data->irq, ds1wm_isr,IRQF_DISABLED ,"ds1wm" , ds1wm_data);
include/linux/ds1wm.h +0 -1
@@ -6,7 +6,6 @@ struct ds1wm_platform_data {* e.g. on h5xxx and h2200 this is 2 * (registers aligned to 4-byte boundaries), * while on hx4700 this is 1 */ -int active_high;/* interrupt polarity, passed to DS1WM as IAS bit */ void (*enable)(struct platform_device *pdev);void (*disable)(struct platform_device *pdev); };
Signature · 1 line
1.5.1.1
PATCH 2/2 ds1wm: disable interrupts when turning off ds1wm
Disable interrupts when turning off ds1wm.
Signed-off-by Matt Reimer <[email protected]>
--- drivers/w1/masters/ds1wm.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
drivers/w1/masters/ds1wm.c +4 -0
@@ -237,6 +237,10 @@ static void ds1wm_down(struct ds1wm_data *ds1wm_data) {ds1wm_reset (ds1wm_data); +/* Disable interrupts. */ +ds1wm_write_register (ds1wm_data,DS1WM_INT_EN , + ds1wm_data->active_high ?DS1WM_INTEN_IAS :0 ); +if (ds1wm_data->pdata->disable) ds1wm_data->pdata->disable (ds1wm_data->pdev);
Signature · 1 line
1.5.1.1