Skip to contentSkip to conversation

2.5.50-current-bk and EDD

PATCH In review Petr Vandrovec 2 participants 2 messages Dec 2, 2002

lore
Share & tools
lore

Petr Vandrovec

author
#0 lore raw

PATCH 1/1 2.5.50-current-bk and EDD

Hi Matt,
I'm not sure that this patch is correct, but at least I can
compile kernel now. As I have no SCSI devices in the box, I have no idea whether this to_scsi_host() should do same thing as to_scsi_host() in drivers/scsi does...
Thanks,
Petr Vandrovec

arch/i386/kernel/edd.c +0 -2
diff -urdN linux/arch/i386/kernel/edd.c linux/arch/i386/kernel/edd.c
@@ -686,8 +686,6 @@
  * The reference counting probably isn't the best it could be.
  */
 
-#define	to_scsi_host(d)	\
-	container_of(d, struct Scsi_Host, host_driverfs_dev)
 #define children_to_dev(n) container_of(n,struct device,node)
 static struct scsi_device *
 edd_find_matching_scsi_device(struct edd_device *edev)
#1 lore raw
Quoted 14 lines · Petr Vandrovec [[email protected]] wrote:

Hi Matt,
I'm not sure that this patch is correct, but at least I can
compile kernel now. As I have no SCSI devices in the box, I have no idea whether this to_scsi_host() should do same thing as to_scsi_host() in drivers/scsi does...
Thanks,
Petr Vandrovec

diff -urdN linux/arch/i386/kernel/edd.c linux/arch/i386/kernel/edd.c

arch/i386/kernel/edd.c line 691

Quoted 8 lines
arch/i386/kernel/edd.c +0 -2
@@ -686,8 +686,6 @@
  * The reference counting probably isn't the best it could be.
  */
 
-#define	to_scsi_host(d)	\
-	container_of(d, struct Scsi_Host, host_driverfs_dev)
 #define children_to_dev(n) container_of(n,struct device,node)
 static struct scsi_device *
 edd_find_matching_scsi_device(struct edd_device *edev)

This is my bad with some sysfs updates I did recently to scsi. The patch will make you compile, but the to_scsi_host is host.h does not return the same data as the previous to_scsi_host in edd.c did if class_data is not set. Though the "sh" variable is never used in the function edd_find_matching_scsi_device. I will look over this function some more and send mail to the list / Matt as to what else might have broke.

-andmike
--
Michael Anderson
[email protected]