All of lore.kernel.org
 help / color / mirror / Atom feed
From: Kalle Valo <kvalo@codeaurora.org>
To: Taehee Yoo <ap420073@gmail.com>
Cc: Larry.Finger@lwfinger.net, ap420073@gmail.com,
	linux-wireless@vger.kernel.org
Subject: Re: rtlwifi: rtl8192cu: Remove pci check routine inrtl92c_enable_interrupt.
Date: Tue, 18 Aug 2015 06:02:17 +0000 (UTC)	[thread overview]
Message-ID: <20150818060217.77A18140366@smtp.codeaurora.org> (raw)
In-Reply-To: <1428652199-28713-1-git-send-email-ap420073@gmail.com>


> I change three things about below.
> 
> 1. remove pci interface check routine in rtl92c_enable_interrupt
> because rtl8192cu chipset is always usb interface.
> 
> 2. rename rtl92c_xxx_interrupt to rtl92cu_xxx_interrupt.
> rtl92c_xxx_interrupt functions can only be handled rtl8192cu chipset.
> 
> 3. remove rtl92c_init_interrupt wrapper function
> because rtl92cu_enable_interrupt does not need to have the wrapper function anymore.
> 
> Signed-off-by: Taehee Yoo <ap420073@gmail.com>

This failed to apply:

Applying: rtlwifi: rtl8192cu: Remove pci check routine in rtl92c_enable_interrupt.
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/wireless/rtlwifi/rtl8192cu/mac.h
CONFLICT (content): Merge conflict in drivers/net/wireless/rtlwifi/rtl8192cu/mac.h
Auto-merging drivers/net/wireless/rtlwifi/rtl8192cu/mac.c
Auto-merging drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
Failed to merge in the changes.
Patch failed at 0001 rtlwifi: rtl8192cu: Remove pci check routine in rtl92c_enable_interrupt.

Kalle

      reply	other threads:[~2015-08-18  6:02 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-04-10  7:49 [PATCH] rtlwifi: rtl8192cu: Remove pci check routine in rtl92c_enable_interrupt Taehee Yoo
2015-08-18  6:02 ` Kalle Valo [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20150818060217.77A18140366@smtp.codeaurora.org \
    --to=kvalo@codeaurora.org \
    --cc=Larry.Finger@lwfinger.net \
    --cc=ap420073@gmail.com \
    --cc=linux-wireless@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.