Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 72443
b: refs/heads/master
c: 06efcad
h: refs/heads/master
i:
  72441: 2305022
  72439: 9457600
v: v3
  • Loading branch information
Jeff Garzik committed Oct 23, 2007
1 parent 7c1bc98 commit 327d33c
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5712cb3d81566893c3b14e24075cf48ec5c35d00
refs/heads/master: 06efcad0d43a5491602f7d7bfc1ce997cdb0d062
5 changes: 3 additions & 2 deletions trunk/drivers/atm/horizon.c
Original file line number Diff line number Diff line change
Expand Up @@ -1382,8 +1382,9 @@ static inline void rx_data_av_handler (hrz_dev * dev) {

/********** interrupt handler **********/

static irqreturn_t interrupt_handler(int irq, void *dev_id) {
hrz_dev * dev = (hrz_dev *) dev_id;
static irqreturn_t interrupt_handler(int irq, void *dev_id)
{
hrz_dev *dev = dev_id;
u32 int_source;
unsigned int irq_ok;

Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/char/tpm/tpm_tis.c
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ static struct tpm_vendor_specific tpm_tis = {

static irqreturn_t tis_int_probe(int irq, void *dev_id)
{
struct tpm_chip *chip = (struct tpm_chip *) dev_id;
struct tpm_chip *chip = dev_id;
u32 interrupt;

interrupt = ioread32(chip->vendor.iobase +
Expand All @@ -401,7 +401,7 @@ static irqreturn_t tis_int_probe(int irq, void *dev_id)

static irqreturn_t tis_int_handler(int irq, void *dev_id)
{
struct tpm_chip *chip = (struct tpm_chip *) dev_id;
struct tpm_chip *chip = dev_id;
u32 interrupt;
int i;

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/mtd/onenand/onenand_base.c
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ static int onenand_wait(struct mtd_info *mtd, int state)
*/
static irqreturn_t onenand_interrupt(int irq, void *data)
{
struct onenand_chip *this = (struct onenand_chip *) data;
struct onenand_chip *this = data;

/* To handle shared interrupt */
if (!this->complete.done)
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/typhoon.c
Original file line number Diff line number Diff line change
Expand Up @@ -1801,7 +1801,7 @@ typhoon_poll(struct napi_struct *napi, int budget)
static irqreturn_t
typhoon_interrupt(int irq, void *dev_instance)
{
struct net_device *dev = (struct net_device *) dev_instance;
struct net_device *dev = dev_instance;
struct typhoon *tp = dev->priv;
void __iomem *ioaddr = tp->ioaddr;
u32 intr_status;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/ucc_geth.c
Original file line number Diff line number Diff line change
Expand Up @@ -3607,7 +3607,7 @@ static int ucc_geth_poll(struct napi_struct *napi, int budget)

static irqreturn_t ucc_geth_irq_handler(int irq, void *info)
{
struct net_device *dev = (struct net_device *)info;
struct net_device *dev = info;
struct ucc_geth_private *ugeth = netdev_priv(dev);
struct ucc_fast_private *uccf;
struct ucc_geth_info *ug_info;
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/net/wan/sbni.c
Original file line number Diff line number Diff line change
Expand Up @@ -502,8 +502,8 @@ sbni_start_xmit( struct sk_buff *skb, struct net_device *dev )
static irqreturn_t
sbni_interrupt( int irq, void *dev_id )
{
struct net_device *dev = (struct net_device *) dev_id;
struct net_local *nl = (struct net_local *) dev->priv;
struct net_device *dev = dev_id;
struct net_local *nl = dev->priv;
int repeat;

spin_lock( &nl->lock );
Expand Down

0 comments on commit 327d33c

Please sign in to comment.