Joe Perches <j...@perches.com> writes: > Use the more common logging mechanism passing wl->dev where > appropriate. Remove the macros. Add argument struct wl1271 *wl to > some functions to make these logging mechanisms work. > > Miscellanea: > > o Coalesce formats, add required trailing \n to formats > Some formats already had previously incorrect \n uses > o Realign arguments > o Correct a couple typos and grammar defects > o Split a multiple line error message to multiple calls of dev_err > o Add #define pr_fmt when pr_<level> is used > o Remove unnecessary/duplicate pr_fmt use from wl1271_debug macro > > Signed-off-by: Joe Perches <j...@perches.com>
Doesn't apply anymore: Applying: ti: Convert wl1271_<level> logging macros to dev_<level> or pr_<level> Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging drivers/net/wireless/ti/wlcore/wlcore_i.h Auto-merging drivers/net/wireless/ti/wlcore/tx.c Auto-merging drivers/net/wireless/ti/wlcore/scan.c Auto-merging drivers/net/wireless/ti/wlcore/rx.c Auto-merging drivers/net/wireless/ti/wlcore/ps.c Auto-merging drivers/net/wireless/ti/wlcore/main.c Auto-merging drivers/net/wireless/ti/wlcore/cmd.c CONFLICT (content): Merge conflict in drivers/net/wireless/ti/wlcore/cmd.c Auto-merging drivers/net/wireless/ti/wl18xx/tx.c Auto-merging drivers/net/wireless/ti/wl18xx/scan.c Auto-merging drivers/net/wireless/ti/wl18xx/main.c Auto-merging drivers/net/wireless/ti/wl18xx/event.c Auto-merging drivers/net/wireless/ti/wl18xx/debugfs.c Auto-merging drivers/net/wireless/ti/wl18xx/cmd.c Auto-merging drivers/net/wireless/ti/wl12xx/scan.c Auto-merging drivers/net/wireless/ti/wl12xx/main.c Failed to merge in the changes. -- Kalle Valo -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
