From patchwork Tue Nov 16 15:27:51 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Namhyung Kim X-Patchwork-Id: 71409 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 60AC5B713A for ; Wed, 17 Nov 2010 02:28:23 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752155Ab0KPP1z (ORCPT ); Tue, 16 Nov 2010 10:27:55 -0500 Received: from mail-pv0-f174.google.com ([74.125.83.174]:64638 "EHLO mail-pv0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751079Ab0KPP1y (ORCPT ); Tue, 16 Nov 2010 10:27:54 -0500 Received: by pva4 with SMTP id 4so110974pva.19 for ; Tue, 16 Nov 2010 07:27:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=UnmErv8ZDr0vNpL0cD/uYhKYYi7tOiUsHLlb7UkdOWE=; b=wuHhCcvE7nOecb+qxBmjlKIgrE+io+LW4Kr8pCU7Uc6DjHEWFwOi+xJSxzefEvvZB2 on2Rb8wBzlZOnYmiMnSmiTGiKCqWhknm+cilqs0z6CXhBtKRY6pI9aSaSw9rL+TNOMAl 7V1cVIyP/k1jEkXm0P/MkSB4ipdYzBjK2W1Eo= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=GSfl0nOOhWeFXJkL9YG0I5b1zLcLnhXw8IuNJ+Zz23DtoIDh0w2ll9f9kYUZSXZQi8 YJdgxBfMkVFTV7BJv5rpoVGmFi0fB7C+6bDF4Oe2dVFcYN2B3o8NqFO0Z1hwq5uiAz16 dP6Yl2Rc3h8CM/7I12wusI70BsoO/CuDi9Y44= Received: by 10.143.16.13 with SMTP id t13mr5757178wfi.46.1289921273499; Tue, 16 Nov 2010 07:27:53 -0800 (PST) Received: from localhost.localdomain ([211.201.183.198]) by mx.google.com with ESMTPS id w31sm1520253wfd.2.2010.11.16.07.27.50 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 16 Nov 2010 07:27:52 -0800 (PST) From: Namhyung Kim To: Steffen Klassert , netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH] 3c59x: fix build failure on !CONFIG_PCI Date: Wed, 17 Nov 2010 00:27:51 +0900 Message-Id: <1289921271-15295-1-git-send-email-namhyung@gmail.com> X-Mailer: git-send-email 1.7.0.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org VORTEX_PCI() could return NULL so it needs to be casted before accessing any member of struct pci_dev. This fixes following build failure. Likewise VORTEX_EISA() was changed also. CC [M] drivers/net/3c59x.o drivers/net/3c59x.c: In function 'acpi_set_WOL': drivers/net/3c59x.c:3211:39: warning: dereferencing 'void *' pointer drivers/net/3c59x.c:3211:39: error: request for member 'current_state' in something not a structure or union make[3]: *** [drivers/net/3c59x.o] Error 1 make[2]: *** [drivers/net/3c59x.o] Error 2 make[1]: *** [sub-make] Error 2 make: *** [all] Error 2 Signed-off-by: Namhyung Kim --- drivers/net/3c59x.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c index e1da258..0a92436 100644 --- a/drivers/net/3c59x.c +++ b/drivers/net/3c59x.c @@ -699,7 +699,8 @@ DEFINE_WINDOW_IO(32) #define DEVICE_PCI(dev) NULL #endif -#define VORTEX_PCI(vp) (((vp)->gendev) ? DEVICE_PCI((vp)->gendev) : NULL) +#define VORTEX_PCI(vp) \ + ((struct pci_dev *) (((vp)->gendev) ? DEVICE_PCI((vp)->gendev) : NULL)) #ifdef CONFIG_EISA #define DEVICE_EISA(dev) (((dev)->bus == &eisa_bus_type) ? to_eisa_device((dev)) : NULL) @@ -707,7 +708,8 @@ DEFINE_WINDOW_IO(32) #define DEVICE_EISA(dev) NULL #endif -#define VORTEX_EISA(vp) (((vp)->gendev) ? DEVICE_EISA((vp)->gendev) : NULL) +#define VORTEX_EISA(vp) \ + ((struct eisa_device *) (((vp)->gendev) ? DEVICE_EISA((vp)->gendev) : NULL)) /* The action to take with a media selection timer tick. Note that we deviate from the 3Com order by checking 10base2 before AUI.