Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d15d6a4 authored by James Bottomley's avatar James Bottomley
Browse files

[SCSI] st: fix up after class_device removal 



There's a change in the SCSI tree that adds another class_device, so change
it to an ordinary device

[jejb: this one got rebased until it's basically cosmetic only]

Cc: Kai Makisara <Kai.Makisara@kolumbus.fi>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 80750147

drivers/scsi/st.c

+5 −5
Original line number Diff line number Diff line
@@ -4322,7 +4322,7 @@ static void do_remove_sysfs_files(void) 
static ssize_t

st_defined_show(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct st_modedef *STm = (struct st_modedef *)dev_get_drvdata(dev);

	struct st_modedef *STm = dev_get_drvdata(dev);

	ssize_t l = 0;



	l = snprintf(buf, PAGE_SIZE, "%d\n", STm->defined);
@@ -4334,7 +4334,7 @@ DEVICE_ATTR(defined, S_IRUGO, st_defined_show, NULL); 
static ssize_t

st_defblk_show(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct st_modedef *STm = (struct st_modedef *)dev_get_drvdata(dev);

	struct st_modedef *STm = dev_get_drvdata(dev);

	ssize_t l = 0;



	l = snprintf(buf, PAGE_SIZE, "%d\n", STm->default_blksize);
@@ -4346,7 +4346,7 @@ DEVICE_ATTR(default_blksize, S_IRUGO, st_defblk_show, NULL); 
static ssize_t

st_defdensity_show(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct st_modedef *STm = (struct st_modedef *)dev_get_drvdata(dev);

	struct st_modedef *STm = dev_get_drvdata(dev);

	ssize_t l = 0;

	char *fmt;
@@ -4361,7 +4361,7 @@ static ssize_t 
st_defcompression_show(struct device *dev, struct device_attribute *attr,

		       char *buf)

{

	struct st_modedef *STm = (struct st_modedef *)dev_get_drvdata(dev);

	struct st_modedef *STm = dev_get_drvdata(dev);

	ssize_t l = 0;



	l = snprintf(buf, PAGE_SIZE, "%d\n", STm->default_compression - 1);
@@ -4373,7 +4373,7 @@ DEVICE_ATTR(default_compression, S_IRUGO, st_defcompression_show, NULL); 
static ssize_t

st_options_show(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct st_modedef *STm = (struct st_modedef *)dev_get_drvdata(dev);

	struct st_modedef *STm = dev_get_drvdata(dev);

	struct scsi_tape *STp;

	int i, j, options;

	ssize_t l = 0;