All of lore.kernel.org
 help / color / mirror / Atom feed
From: Geoff Levand <geoffrey.levand@am.sony.com>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Mel Gorman <mel@csn.ul.ie>,
	linuxppc-dev@ozlabs.org,
	Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Subject: [patch] powerpc/ps3: Use hard coded values for LV1 device type
Date: Fri, 6 Feb 2009 18:42:54 -0800	[thread overview]
Message-ID: <498CF52E.4040903@am.sony.com> (raw)
In-Reply-To: <498C6C49.1010200@in.ibm.com>

Change the PS3 platform code to use hard coded numbers for its
LV1 device types.

The PS3 platform code was incorrectly using some scsi block
constants for the device type returned from the LV1 hypervisor.

Fixes build errors like these when CONFIG_BLOCK=n:

  In file included from include/scsi/scsi.h:12,
                   from arch/powerpc/platforms/ps3/platform.h:25,
                   from arch/powerpc/platforms/ps3/setup.c:36:
  include/scsi/scsi_cmnd.h:27:25: warning: "BLK_MAX_CDB" is not defined
  include/scsi/scsi_cmnd.h:28:3: error: #error MAX_COMMAND_SIZE can not be bigger than BLK_MAX_CDB

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
---
Ben,

Please send upstream for 2.6.29.

-Geoff

 arch/powerpc/platforms/ps3/platform.h |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

--- a/arch/powerpc/platforms/ps3/platform.h
+++ b/arch/powerpc/platforms/ps3/platform.h
@@ -22,8 +22,6 @@
 #define _PS3_PLATFORM_H
 
 #include <linux/rtc.h>
-#include <scsi/scsi.h>
-
 #include <asm/ps3.h>
 
 /* htab */
@@ -83,12 +81,12 @@ enum ps3_bus_type {
 };
 
 enum ps3_dev_type {
-	PS3_DEV_TYPE_STOR_DISK = TYPE_DISK,	/* 0 */
+	PS3_DEV_TYPE_STOR_DISK = 0, /* TYPE_DISK */
 	PS3_DEV_TYPE_SB_GELIC = 3,
 	PS3_DEV_TYPE_SB_USB = 4,
-	PS3_DEV_TYPE_STOR_ROM = TYPE_ROM,	/* 5 */
+	PS3_DEV_TYPE_STOR_ROM = 5, /* TYPE_ROM */
 	PS3_DEV_TYPE_SB_GPIO = 6,
-	PS3_DEV_TYPE_STOR_FLASH = TYPE_RBC,	/* 14 */
+	PS3_DEV_TYPE_STOR_FLASH = 14, /* TYPE_RBC */
 };
 
 int ps3_repository_read_bus_str(unsigned int bus_index, const char *bus_str,

  reply	other threads:[~2009-02-07  2:43 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-02-06 16:58 2.6.29-rc3-git9 build break : arch/powerpc/platforms/ps3/setup.o Sachin P. Sant
2009-02-07  2:42 ` Geoff Levand [this message]
2009-02-07 17:41   ` [patch] powerpc/ps3: Use hard coded values for LV1 device type Sachin P. Sant
2009-02-08 11:29   ` Michael Ellerman
2009-02-09  0:11     ` Benjamin Herrenschmidt
2009-02-09  3:59       ` James Bottomley
2009-02-09  3:59         ` James Bottomley
2009-02-10 22:46         ` Geoff Levand
2009-02-10 22:46           ` Geoff Levand
2009-02-11  5:28         ` Sachin P. Sant
2009-02-11  5:28           ` Sachin P. Sant

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=498CF52E.4040903@am.sony.com \
    --to=geoffrey.levand@am.sony.com \
    --cc=benh@kernel.crashing.org \
    --cc=kamalesh@linux.vnet.ibm.com \
    --cc=linuxppc-dev@ozlabs.org \
    --cc=mel@csn.ul.ie \
    /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.