pata_platform: Remove useless irq_flags field
IRQ flags can be obtained from resource structure, there are no need to use additional field in the platform_data to store these values. This patch removes this field and convert existing users of this driver to use IRQ flags from the resources. Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Tejun Heo <tj@kernel.org>
This commit is contained in:
parent
ca99140a63
commit
53f3cc4633
|
@ -733,7 +733,6 @@ static struct platform_device bfin_mac_device = {
|
|||
|
||||
static struct pata_platform_info bfin_pata_platform_data = {
|
||||
.ioport_shift = 2,
|
||||
.irq_type = IRQF_TRIGGER_HIGH,
|
||||
};
|
||||
|
||||
static struct resource bfin_pata_resources[] = {
|
||||
|
@ -750,7 +749,7 @@ static struct resource bfin_pata_resources[] = {
|
|||
{
|
||||
.start = PATA_INT,
|
||||
.end = PATA_INT,
|
||||
.flags = IORESOURCE_IRQ,
|
||||
.flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
|
||||
},
|
||||
};
|
||||
|
||||
|
|
|
@ -587,7 +587,6 @@ static struct platform_device bfin_mac_device = {
|
|||
|
||||
static struct pata_platform_info bfin_pata_platform_data = {
|
||||
.ioport_shift = 2,
|
||||
.irq_type = IRQF_TRIGGER_HIGH,
|
||||
};
|
||||
|
||||
static struct resource bfin_pata_resources[] = {
|
||||
|
@ -604,7 +603,7 @@ static struct resource bfin_pata_resources[] = {
|
|||
{
|
||||
.start = PATA_INT,
|
||||
.end = PATA_INT,
|
||||
.flags = IORESOURCE_IRQ,
|
||||
.flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
|
||||
},
|
||||
};
|
||||
|
||||
|
|
|
@ -2462,7 +2462,6 @@ static struct platform_device bfin_sport0_device = {
|
|||
#define PATA_INT IRQ_PF5
|
||||
static struct pata_platform_info bfin_pata_platform_data = {
|
||||
.ioport_shift = 1,
|
||||
.irq_flags = IRQF_TRIGGER_HIGH,
|
||||
};
|
||||
|
||||
static struct resource bfin_pata_resources[] = {
|
||||
|
@ -2479,7 +2478,7 @@ static struct resource bfin_pata_resources[] = {
|
|||
{
|
||||
.start = PATA_INT,
|
||||
.end = PATA_INT,
|
||||
.flags = IORESOURCE_IRQ,
|
||||
.flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
|
||||
},
|
||||
};
|
||||
#elif defined(CF_IDE_NAND_CARD_USE_CF_IN_COMMON_MEMORY_MODE)
|
||||
|
|
|
@ -589,7 +589,6 @@ static struct platform_device bfin_mac_device = {
|
|||
|
||||
static struct pata_platform_info bfin_pata_platform_data = {
|
||||
.ioport_shift = 2,
|
||||
.irq_type = IRQF_TRIGGER_HIGH,
|
||||
};
|
||||
|
||||
static struct resource bfin_pata_resources[] = {
|
||||
|
@ -606,7 +605,7 @@ static struct resource bfin_pata_resources[] = {
|
|||
{
|
||||
.start = PATA_INT,
|
||||
.end = PATA_INT,
|
||||
.flags = IORESOURCE_IRQ,
|
||||
.flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
|
||||
},
|
||||
};
|
||||
|
||||
|
|
|
@ -354,7 +354,6 @@ static struct platform_device bfin_sir0_device = {
|
|||
|
||||
static struct pata_platform_info bfin_pata_platform_data = {
|
||||
.ioport_shift = 2,
|
||||
.irq_type = IRQF_TRIGGER_HIGH,
|
||||
};
|
||||
|
||||
static struct resource bfin_pata_resources[] = {
|
||||
|
@ -371,7 +370,7 @@ static struct resource bfin_pata_resources[] = {
|
|||
{
|
||||
.start = PATA_INT,
|
||||
.end = PATA_INT,
|
||||
.flags = IORESOURCE_IRQ,
|
||||
.flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
|
||||
},
|
||||
};
|
||||
|
||||
|
|
|
@ -43,8 +43,6 @@ static int pata_of_platform_probe(struct platform_device *ofdev)
|
|||
}
|
||||
|
||||
irq_res = platform_get_resource(ofdev, IORESOURCE_IRQ, 0);
|
||||
if (irq_res)
|
||||
irq_res->flags = 0;
|
||||
|
||||
prop = of_get_property(dn, "reg-shift", NULL);
|
||||
if (prop)
|
||||
|
|
|
@ -118,7 +118,7 @@ int __pata_platform_probe(struct device *dev, struct resource *io_res,
|
|||
*/
|
||||
if (irq_res && irq_res->start > 0) {
|
||||
irq = irq_res->start;
|
||||
irq_flags = irq_res->flags;
|
||||
irq_flags = irq_res->flags & IRQF_TRIGGER_MASK;
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -213,8 +213,6 @@ static int pata_platform_probe(struct platform_device *pdev)
|
|||
* And the IRQ
|
||||
*/
|
||||
irq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
|
||||
if (irq_res)
|
||||
irq_res->flags = pp_info ? pp_info->irq_flags : 0;
|
||||
|
||||
return __pata_platform_probe(&pdev->dev, io_res, ctl_res, irq_res,
|
||||
pp_info ? pp_info->ioport_shift : 0,
|
||||
|
|
|
@ -8,11 +8,6 @@ struct pata_platform_info {
|
|||
* spacing used by ata_std_ports().
|
||||
*/
|
||||
unsigned int ioport_shift;
|
||||
/*
|
||||
* Indicate platform specific irq types and initial
|
||||
* IRQ flags when call request_irq()
|
||||
*/
|
||||
unsigned int irq_flags;
|
||||
};
|
||||
|
||||
extern int __pata_platform_probe(struct device *dev,
|
||||
|
|
Loading…
Reference in New Issue
Block a user