From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: [merged] hpsa-remove-unneeded-defines.patch removed from -mm tree Date: Mon, 03 May 2010 13:09:45 -0400 Message-ID: <201005032011.o43KBGI5019183@imap1.linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:60686 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756660Ab0ECULV (ORCPT ); Mon, 3 May 2010 16:11:21 -0400 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: mike.miller@hp.com, James.Bottomley@HansenPartnership.com, steve.cameron@hp.com, mm-commits@vger.kernel.org The patch titled hpsa: remove unneeded defines has been removed from the -mm tree. Its filename was hpsa-remove-unneeded-defines.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: hpsa: remove unneeded defines From: Mike Miller Remove unnecessary #define's from hpsa. The SCSI midlayer handles all this for us. Signed-off-by: Mike Miller Cc: Steve Cameron Cc: James Bottomley Signed-off-by: Andrew Morton --- drivers/scsi/hpsa.c | 8 -------- drivers/scsi/hpsa_cmd.h | 15 --------------- 2 files changed, 23 deletions(-) diff -puN drivers/scsi/hpsa.c~hpsa-remove-unneeded-defines drivers/scsi/hpsa.c --- a/drivers/scsi/hpsa.c~hpsa-remove-unneeded-defines +++ a/drivers/scsi/hpsa.c @@ -2708,14 +2708,6 @@ static void fill_cmd(struct CommandList c->Request.CDB[8] = (size >> 8) & 0xFF; c->Request.CDB[9] = size & 0xFF; break; - - case HPSA_READ_CAPACITY: - c->Request.CDBLen = 10; - c->Request.Type.Attribute = ATTR_SIMPLE; - c->Request.Type.Direction = XFER_READ; - c->Request.Timeout = 0; - c->Request.CDB[0] = cmd; - break; case HPSA_CACHE_FLUSH: c->Request.CDBLen = 12; c->Request.Type.Attribute = ATTR_SIMPLE; diff -puN drivers/scsi/hpsa_cmd.h~hpsa-remove-unneeded-defines drivers/scsi/hpsa_cmd.h --- a/drivers/scsi/hpsa_cmd.h~hpsa-remove-unneeded-defines +++ a/drivers/scsi/hpsa_cmd.h @@ -152,21 +152,6 @@ struct SenseSubsystem_info { u8 reserved1[1108]; }; -#define HPSA_READ_CAPACITY 0x25 /* Read Capacity */ -struct ReadCapdata { - u8 total_size[4]; /* Total size in blocks */ - u8 block_size[4]; /* Size of blocks in bytes */ -}; - -#if 0 -/* 12 byte commands not implemented in firmware yet. */ -#define HPSA_READ 0xa8 -#define HPSA_WRITE 0xaa -#endif - -#define HPSA_READ 0x28 /* Read(10) */ -#define HPSA_WRITE 0x2a /* Write(10) */