From patchwork Tue Jul 6 00:37:40 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ohad Ben Cohen X-Patchwork-Id: 110321 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o660eeUb022043 for ; Tue, 6 Jul 2010 00:40:40 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757022Ab0GFAki (ORCPT ); Mon, 5 Jul 2010 20:40:38 -0400 Received: from mail-bw0-f46.google.com ([209.85.214.46]:37901 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756458Ab0GFAkh (ORCPT ); Mon, 5 Jul 2010 20:40:37 -0400 Received: by mail-bw0-f46.google.com with SMTP id 1so3098513bwz.19 for ; Mon, 05 Jul 2010 17:40:36 -0700 (PDT) Received: by 10.204.49.196 with SMTP id w4mr2984046bkf.73.1278376830207; Mon, 05 Jul 2010 17:40:30 -0700 (PDT) Received: from localhost.localdomain ([46.116.56.182]) by mx.google.com with ESMTPS id v6sm20227262bkx.11.2010.07.05.17.40.24 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 05 Jul 2010 17:40:29 -0700 (PDT) From: Ohad Ben-Cohen To: , , Cc: , , Chikkature Rajashekar Madhusudhan , Luciano Coelho , , San Mehat , Ohad Ben-Cohen Subject: [PATCH 09/15] wireless: wl12xx: support pdata SDIO handlers Date: Tue, 6 Jul 2010 03:37:40 +0300 Message-Id: <1278376666-3509-10-git-send-email-ohad@wizery.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1278376666-3509-1-git-send-email-ohad@wizery.com> References: <1278376666-3509-1-git-send-email-ohad@wizery.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 06 Jul 2010 00:40:40 +0000 (UTC) diff --git a/drivers/net/wireless/wl12xx/wl1271.h b/drivers/net/wireless/wl12xx/wl1271.h index 6f1b6b5..fc4d122 100644 --- a/drivers/net/wireless/wl12xx/wl1271.h +++ b/drivers/net/wireless/wl12xx/wl1271.h @@ -356,6 +356,10 @@ struct wl1271 { struct wl1271_if_operations *if_ops; void (*set_power)(bool enable); + /* SDIO card detect emulation */ + void (*set_carddetect)(bool card_present); + void (*set_embedded_data)(void *priv); + int irq; spinlock_t wl_lock; diff --git a/include/linux/wl12xx.h b/include/linux/wl12xx.h index 137ac89..4106184 100644 --- a/include/linux/wl12xx.h +++ b/include/linux/wl12xx.h @@ -26,6 +26,8 @@ struct wl12xx_platform_data { void (*set_power)(bool enable); + void (*set_carddetect)(bool card_present); + void (*set_embedded_data)(void *priv); /* SDIO only: IRQ number if WLAN_IRQ line is used, 0 for SDIO IRQs */ int irq; bool use_eeprom;