Commit 34dabd81 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'pnp-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull PNP updates from Rafael Wysocki:
 "Get rid of unused variable and function (yu kuai)"

* tag 'pnp-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PNP: isapnp: remove defined but not used function 'isapnp_checksum'
  PNP: isapnp: remove set but not used variable 'checksum'
parents 85c009e8 786c87cd
...@@ -746,35 +746,13 @@ static void __init isapnp_parse_resource_map(struct pnp_card *card) ...@@ -746,35 +746,13 @@ static void __init isapnp_parse_resource_map(struct pnp_card *card)
} }
} }
/*
* Compute ISA PnP checksum for first eight bytes.
*/
static unsigned char __init isapnp_checksum(unsigned char *data)
{
int i, j;
unsigned char checksum = 0x6a, bit, b;
for (i = 0; i < 8; i++) {
b = data[i];
for (j = 0; j < 8; j++) {
bit = 0;
if (b & (1 << j))
bit = 1;
checksum =
((((checksum ^ (checksum >> 1)) & 0x01) ^ bit) << 7)
| (checksum >> 1);
}
}
return checksum;
}
/* /*
* Build device list for all present ISA PnP devices. * Build device list for all present ISA PnP devices.
*/ */
static int __init isapnp_build_device_list(void) static int __init isapnp_build_device_list(void)
{ {
int csn; int csn;
unsigned char header[9], checksum; unsigned char header[9];
struct pnp_card *card; struct pnp_card *card;
u32 eisa_id; u32 eisa_id;
char id[8]; char id[8];
...@@ -784,7 +762,6 @@ static int __init isapnp_build_device_list(void) ...@@ -784,7 +762,6 @@ static int __init isapnp_build_device_list(void)
for (csn = 1; csn <= isapnp_csn_count; csn++) { for (csn = 1; csn <= isapnp_csn_count; csn++) {
isapnp_wake(csn); isapnp_wake(csn);
isapnp_peek(header, 9); isapnp_peek(header, 9);
checksum = isapnp_checksum(header);
eisa_id = header[0] | header[1] << 8 | eisa_id = header[0] | header[1] << 8 |
header[2] << 16 | header[3] << 24; header[2] << 16 | header[3] << 24;
pnp_eisa_id_to_string(eisa_id, id); pnp_eisa_id_to_string(eisa_id, id);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment